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

Patch Carl reward animation not cleaning up and update the votifier server to use uuid as the key for the status repository

Browse Source
This commit is contained in:
AlexTheCoder 2017-03-10 15:43:40 -05:00 committed by cnr
parent 4778d28be4
commit 2881071c74
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,6 +242,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
_voteList.add("http://vote3.mineplex.com"); _voteList.add("http://vote3.mineplex.com");
} }
_canVote = true; _canVote = true;
Bukkit.broadcastMessage("CAN VOTE IS TRUE");
_youtubers = new ArrayList<>(); _youtubers = new ArrayList<>();
if (!ClansBonus) if (!ClansBonus)
@ -260,7 +261,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
} }
else else
{ {
if(carlLocation != null) if (carlLocation != null)
{ {
_carlNpc.setLocation(carlLocation); _carlNpc.setLocation(carlLocation);
} }
@ -405,14 +406,14 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
if (event.getType() != UpdateType.TICK) if (event.getType() != UpdateType.TICK)
return; return;
_animation.itemClean();
if (_canVote) if (_canVote)
return; return;
if (!_enabled) if (!_enabled)
return; return;
_animation.itemClean();
if (!_animationRunning) if (!_animationRunning)
return; return;

5
Plugins/Mineplex.Votifier/src/mineplex/votifier/VotifierManager.java
View File

@ -118,9 +118,8 @@ public class VotifierManager extends MiniPlugin
} }
} }
String lowerPlayerName = playerName.toLowerCase(); final PlayerStatus usStatus = _usPlayerRepo.getElement(uuid.toString());
final PlayerStatus usStatus = _usPlayerRepo.getElement(lowerPlayerName); final PlayerStatus euStatus = _euPlayerRepo.getElement(uuid.toString());
final PlayerStatus euStatus = _euPlayerRepo.getElement(lowerPlayerName);
System.out.println("Loaded " + playerName + " with uuid " + uuid); System.out.println("Loaded " + playerName + " with uuid " + uuid);
System.out.println("Attempting to award bonus"); System.out.println("Attempting to award bonus");