Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-08-01 00:03:42 -07:00
commit a608783580

View File

@ -156,11 +156,13 @@ public class GameGemManager implements Listener
if (total <= 0) if (total <= 0)
total = 1; total = 1;
/*
if (Manager.GetClients().Get(player).GetRank().Has(Rank.HERO)) if (Manager.GetClients().Get(player).GetRank().Has(Rank.HERO))
total = total * 3; total = total * 3;
else if (Manager.GetClients().Get(player).GetRank().Has(Rank.ULTRA) || Manager.GetDonation().Get(player.getName()).OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA")) else if (Manager.GetClients().Get(player).GetRank().Has(Rank.ULTRA) || Manager.GetDonation().Get(player.getName()).OwnsUnknownPackage(Manager.GetServerConfig().ServerType + " ULTRA"))
total = total * 2; total = total * 2;
*/
if (DoubleGem) if (DoubleGem)
total = total * 2; total = total * 2;
@ -207,6 +209,7 @@ public class GameGemManager implements Listener
earnedGems = (int) (earnedGems * game.GemMultiplier); earnedGems = (int) (earnedGems * game.GemMultiplier);
//Hero / Ultra Boost //Hero / Ultra Boost
/*
if (Manager.GetClients().Get(player).GetRank().Has(Rank.HERO)) if (Manager.GetClients().Get(player).GetRank().Has(Rank.HERO))
{ {
UtilPlayer.message(player, F.elem(C.cGreen + "+" + (earnedGems*2) + " Gems") + " for " + F.elem(C.cPurple + "Hero Rank 3x Gems")); UtilPlayer.message(player, F.elem(C.cGreen + "+" + (earnedGems*2) + " Gems") + " for " + F.elem(C.cPurple + "Hero Rank 3x Gems"));
@ -217,6 +220,7 @@ public class GameGemManager implements Listener
UtilPlayer.message(player, F.elem(C.cGreen + "+" + earnedGems + " Gems") + " for " + F.elem(C.cAqua + "Ultra Rank 2x Gems")); UtilPlayer.message(player, F.elem(C.cGreen + "+" + earnedGems + " Gems") + " for " + F.elem(C.cAqua + "Ultra Rank 2x Gems"));
earnedGems = earnedGems * 2; earnedGems = earnedGems * 2;
} }
*/
//Double Gem //Double Gem
if (DoubleGem) if (DoubleGem)