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

Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus

This commit is contained in:
Sarah 2015-08-11 13:49:53 +02:00
parent e25558fc91 cfcfbbed3b
commit 5c7d140521
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
View File

@ -836,7 +836,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
int availableRewards = 0; int availableRewards = 0;
if (canVote(player)) availableRewards++; if (canVote(player)) availableRewards++;
if (canRank(player)) availableRewards++; if (canRank(player) && _clientManager.hasRank(player, Rank.ULTRA)) availableRewards++;
if (canDaily(player)) availableRewards++; if (canDaily(player)) availableRewards++;
if (getPollManager().getNextPoll(_pollManager.Get(player), _clientManager.Get(player).GetRank()) != null) availableRewards++; if (getPollManager().getNextPoll(_pollManager.Get(player), _clientManager.Get(player).GetRank()) != null) availableRewards++;

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

@ -36,7 +36,7 @@ public class GameGemManager implements Listener
{ {
ArcadeManager Manager; ArcadeManager Manager;
boolean DoubleGem = true; boolean DoubleGem = false;
public GameGemManager(ArcadeManager manager) public GameGemManager(ArcadeManager manager)
{ {