Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Cheese 2015-03-20 23:48:30 +11:00
commit 6a68dc6b24

View File

@ -83,6 +83,7 @@ import mineplex.core.packethandler.PacketPlayOutWorldBorder;
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;
import mineplex.core.visibility.VisibilityManager;
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
@ -744,14 +745,9 @@ public class SurvivalGames extends SoloGame
{ {
if (_deathMatchTime == 5) if (_deathMatchTime == 5)
{ {
for (Player player : GetPlayers(true)) for (Player player : GetPlayers(true))
{ {
for (Player other : GetPlayers(true)) VisibilityManager.Instance.refreshPlayerToAll(player);
{
player.hidePlayer(other);
player.showPlayer(other);
}
} }
} }
else if (_deathMatchTime == 0) else if (_deathMatchTime == 0)