From 3309c0406b7f9deb67ec85716a658a4a236f91d2 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Fri, 7 Nov 2014 13:54:11 -0800 Subject: [PATCH] =?UTF-8?q?Added=20=E2=88=9E=20for=20admin/owners=20as=20p?= =?UTF-8?q?layer=20level.=20Fixed=20customer=20support=20issue=20where=20i?= =?UTF-8?q?t=20wasn't=20totaling=20coins=20correctly.=20Fixed=20Recharge?= =?UTF-8?q?=20memory=20leak.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mineplex.Core/src/mineplex/core/recharge/Recharge.java | 5 +++-- Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java | 2 +- .../staffServer/customerSupport/CustomerSupport.java | 2 +- .../src/nautilus/game/arcade/managers/GameChatManager.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java index 7a3b8661b..145c9040e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java @@ -12,6 +12,7 @@ import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.MiniPlugin; import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.UpdateType; +import mineplex.core.account.event.ClientUnloadEvent; import mineplex.core.common.util.F; import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.UtilPlayer; @@ -187,9 +188,9 @@ public class Recharge extends MiniPlugin } @EventHandler - public void clearPlayer(PlayerQuitEvent event) + public void clearPlayer(ClientUnloadEvent event) { - _recharge.remove(event.getPlayer().getName()); + _recharge.remove(event.GetName()); } public void setDisplayForce(Player player, String ability, boolean displayForce) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index b40433839..f72c5c7be 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -615,7 +615,7 @@ public class HubManager extends MiniClientPlugin boolean ownsUltra = _donationManager.Get(player.getName()).OwnsUltraPackage(); //Level Prefix - String levelStr = ChatColor.GRAY + "" + _achievementManager.get(player, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel() + " " + ChatColor.RESET; + String levelStr = ChatColor.GRAY + "" + (rank.Has(Rank.ADMIN) ? "∞" : _achievementManager.get(player, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel()) + " " + ChatColor.RESET; //Rank Prefix String rankStr = ""; diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java index 1edc83080..0ed25b7e4 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java @@ -111,7 +111,7 @@ public class CustomerSupport extends MiniPlugin for (CoinTransactionToken transaction : donor.getCoinTransactions()) { - if (transaction.Source.equalsIgnoreCase("Poll") || transaction.Source.equalsIgnoreCase("Coin Party Bomb Pickup") || transaction.Source.contains("Reward") || transaction.Source.contains("purchase")) + if (transaction.Source.equalsIgnoreCase("Poll") || transaction.Source.equalsIgnoreCase("Halloween Pumpkin") || transaction.Source.equalsIgnoreCase("Treasure Chest") || transaction.Source.equalsIgnoreCase("Coin Party Bomb Pickup") || transaction.Source.contains("Reward") || transaction.Source.contains("purchase")) { coinTransactionTotal += transaction.Amount; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java index 37d0bbc3f..c95cf8d8e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java @@ -61,7 +61,7 @@ public class GameChatManager implements Listener ownsUltra= Manager.GetDonation().Get(sender.getName()).OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA"); //Level Prefix - String levelStr = ChatColor.GRAY + "" + Manager.GetAchievement().get(sender, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel() + " " + ChatColor.RESET; + String levelStr = ChatColor.GRAY + "" + (rank.Has(Rank.ADMIN) ? "∞" : Manager.GetAchievement().get(sender, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel()) + " " + ChatColor.RESET; //Rank Prefix String rankStr = "";