Fixed merge conflicts
This commit is contained in:
parent
f3196e39fa
commit
6cf76a200e
|
@ -91,8 +91,6 @@ import mineplex.core.common.util.UtilTextMiddle;
|
|||
import mineplex.core.common.util.UtilTime;
|
||||
import mineplex.core.explosion.ExplosionEvent;
|
||||
import mineplex.core.itemstack.ItemStackFactory;
|
||||
import mineplex.core.portal.GenericServer;
|
||||
import mineplex.core.portal.Intent;
|
||||
import mineplex.core.recharge.Recharge;
|
||||
import mineplex.core.updater.UpdateType;
|
||||
import mineplex.core.updater.event.UpdateEvent;
|
||||
|
@ -1746,4 +1744,16 @@ public class Build extends Game
|
|||
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue