JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ∞ for admin/owners as player level.

Browse Source 
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
This commit is contained in:
Jonathan Williams 2014-11-07 13:54:11 -08:00
parent 908a8506a7
commit 3309c0406b
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java
View File

@ -12,6 +12,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.MiniPlugin; import mineplex.core.MiniPlugin;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.account.event.ClientUnloadEvent;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
@ -187,9 +188,9 @@ public class Recharge extends MiniPlugin
} }
@EventHandler @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) public void setDisplayForce(Player player, String ability, boolean displayForce)

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -615,7 +615,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
boolean ownsUltra = _donationManager.Get(player.getName()).OwnsUltraPackage(); boolean ownsUltra = _donationManager.Get(player.getName()).OwnsUltraPackage();
//Level Prefix //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 //Rank Prefix
String rankStr = ""; String rankStr = "";

2
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
View File

@ -111,7 +111,7 @@ public class CustomerSupport extends MiniPlugin
for (CoinTransactionToken transaction : donor.getCoinTransactions()) 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; coinTransactionTotal += transaction.Amount;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
View File

@ -61,7 +61,7 @@ public class GameChatManager implements Listener
ownsUltra= Manager.GetDonation().Get(sender.getName()).OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA"); ownsUltra= Manager.GetDonation().Get(sender.getName()).OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA");
//Level Prefix //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 //Rank Prefix
String rankStr = ""; String rankStr = "";