From 85522cddca099fce94e4d139d3f8708bdba035be Mon Sep 17 00:00:00 2001 From: Chiss Date: Fri, 15 Aug 2014 09:49:00 +1000 Subject: [PATCH] Debug (will clean once fixed) Game stats --- .../mineplex/core/cosmetic/ui/button/CloseButton.java | 2 ++ .../src/mineplex/core/punish/UI/PunishPage.java | 2 ++ .../Mineplex.Core/src/mineplex/core/shop/ShopBase.java | 3 +++ .../src/mineplex/core/shop/page/ConfirmationPage.java | 5 +++++ .../src/mineplex/hub/queue/ui/QueuePage.java | 2 ++ .../game/classcombat/shop/ClassCombatShop.java | 2 ++ .../game/classcombat/shop/page/CustomBuildPage.java | 1 + .../src/nautilus/game/arcade/ArcadeManager.java | 10 +++++----- .../nautilus/game/arcade/addons/TeamArmorAddon.java | 1 + .../src/nautilus/game/arcade/game/Game.java | 4 ++-- .../arcade/game/games/champions/ChampionsDominate.java | 2 +- .../game/arcade/game/games/champions/ChampionsTDM.java | 2 +- .../arcade/game/games/champions/kits/KitKnight.java | 2 +- .../game/arcade/game/games/common/TeamDeathmatch.java | 1 + .../nautilus/game/arcade/game/games/spleef/Spleef.java | 2 +- .../nautilus/game/arcade/managers/GameFlagManager.java | 1 + .../game/arcade/managers/GameLobbyManager.java | 1 + .../game/arcade/managers/GamePlayerManager.java | 1 + .../src/nautilus/game/arcade/managers/MiscManager.java | 2 ++ .../game/tutorial/action/types/InventoryClose.java | 1 + 20 files changed, 36 insertions(+), 11 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/CloseButton.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/CloseButton.java index ed48a635a..2f7073c37 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/CloseButton.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/CloseButton.java @@ -10,11 +10,13 @@ public class CloseButton implements IButton public void ClickedLeft(Player player) { player.closeInventory(); + System.out.println(this.getClass().getName() + " 13"); } @Override public void ClickedRight(Player player) { player.closeInventory(); + System.out.println(this.getClass().getName() + " 19"); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java index 1f1d62099..c20389707 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java @@ -426,6 +426,7 @@ public class PunishPage extends CraftInventoryCustom implements Listener { _plugin.AddPunishment(_target, category, _reason, _player, severity, ban, punishTime); _player.closeInventory(); + System.out.println(this.getClass().getName() + " 429"); ClosePunish(); } @@ -451,6 +452,7 @@ public class PunishPage extends CraftInventoryCustom implements Listener { punishment.Remove(_player.getName(), _reason); _player.closeInventory(); + System.out.println(this.getClass().getName() + " 455"); ClosePunish(); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java index db6a620b9..ce3d8a79e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java @@ -181,6 +181,7 @@ public abstract class ShopBase implements Listene PlayerPageMap.get(event.getPlayer().getName()).Dispose(); event.getPlayer().closeInventory(); + System.out.println(this.getClass().getName() + " 184"); CloseShopForPlayer(event.getPlayer()); PlayerPageMap.remove(event.getPlayer().getName()); @@ -199,6 +200,8 @@ public abstract class ShopBase implements Listene SetCurrentPageForPlayer(player, page); player.openInventory(page); + + System.out.println(this.getClass().getName() + " - player.openInventory(page);"); } public void SetCurrentPageForPlayer(Player player, ShopPageBase> page) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java index 335c26931..fac8be755 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ConfirmationPage.java @@ -104,7 +104,11 @@ public class ConfirmationPage if (_closeOnNextUpdate) { Player.closeInventory(); + System.out.println(this.getClass().getName() + " 138"); return; } @@ -187,6 +188,7 @@ public class QueuePage extends ShopPageBase Plugin.respondToInvite(player, false); player.closeInventory(); + System.out.println(this.getClass().getName() + " 191"); } private void buildSquareAt(int slot, ShopItem item, IButton button) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java index 4c9ea1cbd..57c009d47 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java @@ -56,6 +56,8 @@ public class ClassCombatShop extends ShopBase { if (!CanOpenShop(player)) return false; + + System.out.println(this.getClass().getName() + " - I CAN OPEN SHOP"); OpenedShop.add(player.getName()); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/CustomBuildPage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/CustomBuildPage.java index 4fea97720..e2782064f 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/CustomBuildPage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/CustomBuildPage.java @@ -149,6 +149,7 @@ public class CustomBuildPage extends ShopPageBase()); @@ -1079,7 +1079,7 @@ public abstract class Game implements Listener if (_stats.get(player).containsKey(stat)) past = _stats.get(player).get(stat); - _stats.get(player).put(stat, past + amount); + _stats.get(player).put(stat, limitTo1 ? Math.max(1, past + amount) : past + amount); } public NautHashMap> GetStats() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java index d73395990..842710733 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java @@ -61,7 +61,7 @@ public class ChampionsDominate extends Domination { SetKit(player, GetKits()[2], true); player.closeInventory(); - System.out.println("Closing inventory from validate kit"); + System.out.println(this.getClass().getName() + " 64"); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java index fab78c4b4..2d8c46cc8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java @@ -57,7 +57,7 @@ public class ChampionsTDM extends TeamDeathmatch { SetKit(player, GetKits()[2], true); player.closeInventory(); - System.out.println("Closing inventory from validate kit"); + System.out.println(this.getClass().getName() + " 61"); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java index 0acb6ca38..e38d71a46 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java @@ -26,7 +26,7 @@ public class KitKnight extends Kit { "Knight of the realm, extremely good at", "defending and surviving.", - }, + }, new Perk[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java index 3efce21ac..3446fcc0b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java @@ -164,6 +164,7 @@ public class TeamDeathmatch extends TeamGame { SetKit(player, GetKits()[2], true); player.closeInventory(); + System.out.println(this.getClass().getName() + " 167"); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java index fd5bbeb1f..8ff710f81 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java @@ -134,7 +134,7 @@ public class Spleef extends SoloGame public void BlockFade(Block block, Player player) { - AddStat(player, "BlocksBroken", 1, false); + AddStat(player, "BlocksBroken", 1, false, false); UtilPlayer.hunger(player, 1); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java index 5a116b736..3180ac725 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java @@ -264,6 +264,7 @@ public class GameFlagManager implements Listener { event.setCancelled(true); event.getWhoClicked().closeInventory(); + System.out.println(this.getClass().getName() + " 267"); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java index d5830fca8..148f33cd6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java @@ -1147,6 +1147,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener { event.setCancelled(true); event.getWhoClicked().closeInventory(); + System.out.println(this.getClass().getName() + " 1150"); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java index 155d3d9b6..750c4283e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java @@ -150,6 +150,7 @@ public class GamePlayerManager implements Listener { event.setCancelled(true); event.getWhoClicked().closeInventory(); + System.out.println(this.getClass().getName() + " 153"); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java index 9237ef4a7..a13a2a247 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java @@ -81,12 +81,14 @@ public class MiscManager implements Listener { event.setCancelled(true); player.closeInventory(); + System.out.println(this.getClass().getName() + " 84"); } else if (Manager.GetGame().IsLive() && !Manager.GetGame().IsAlive(player) && !((CraftPlayer)player).getHandle().spectating) { event.setCancelled(true); player.closeInventory(); + System.out.println(this.getClass().getName() + " 91"); } } diff --git a/Plugins/Nautilus.Game.Tutorial/src/nautilus/game/tutorial/action/types/InventoryClose.java b/Plugins/Nautilus.Game.Tutorial/src/nautilus/game/tutorial/action/types/InventoryClose.java index 5175acede..1cd59db33 100644 --- a/Plugins/Nautilus.Game.Tutorial/src/nautilus/game/tutorial/action/types/InventoryClose.java +++ b/Plugins/Nautilus.Game.Tutorial/src/nautilus/game/tutorial/action/types/InventoryClose.java @@ -16,5 +16,6 @@ public class InventoryClose extends Action public void CustomAction(Player player) { player.closeInventory(); + System.out.println(this.getClass().getName() + " 19"); } }