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

Fixed merge conflicts

This commit is contained in:
AlexTheCoder 2017-12-08 05:57:52 -05:00 committed by Alexander Meech
parent f3196e39fa
commit 6cf76a200e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
View File

@ -91,8 +91,6 @@ import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
import mineplex.core.explosion.ExplosionEvent; import mineplex.core.explosion.ExplosionEvent;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.portal.GenericServer;
import mineplex.core.portal.Intent;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
@ -1746,4 +1744,16 @@ public class Build extends Game
return losers; return losers;
} }
@Override
public void disqualify(Player player)
{
super.disqualify(player);
// Remove the player from the map so players don't vote on it
if (_data.containsKey(player))
{
_data.remove(player);
}
}
} }