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

Browse Source
This commit is contained in:
Sarah 2015-08-11 12:05:23 +02:00
commit f3558b144c
2 changed files with 6 additions and 1 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

@ -1014,7 +1014,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
{ {
if (Recharge.Instance.use(player, "Carl Inform", 240000, false, false)) if (Recharge.Instance.use(player, "Carl Inform", 240000, false, false))
{ {
if(_pollManager.Get(player).shouldPoll() || canVote(player) || canRank(player) || canDaily(player)) if(_pollManager.hasPoll(player) || canVote(player) || canRank(player) || canDaily(player))
{ {
if(_showCarl.containsKey(player.getName())) if(_showCarl.containsKey(player.getName()))
UtilPlayer.message(player, C.cDGreen + C.Bold + "Carl the Creeper)" + C.cGreen + " Hey " + player.getName().replace("s", "sss") + "! I have sssome amazing rewardsss for you! Come sssee me!"); UtilPlayer.message(player, C.cDGreen + C.Bold + "Carl the Creeper)" + C.cGreen + " Hey " + player.getName().replace("s", "sss") + "! I have sssome amazing rewardsss for you! Come sssee me!");

5
Plugins/Mineplex.Core/src/mineplex/core/poll/PollManager.java
View File

@ -99,6 +99,11 @@ public class PollManager extends MiniDbClientPlugin<PlayerPollData>
return null; return null;
} }
public boolean hasPoll(Player player)
{
return getNextPoll(Get(player), getClientManager().Get(player).GetRank()) != null;
}
public void displayPoll(Player player, Poll poll) public void displayPoll(Player player, Poll poll)
{ {
String[] answers = poll.getAnswers(); String[] answers = poll.getAnswers();