From a25e2c575db28d8d04eb0e6d07406130f14f8e0f Mon Sep 17 00:00:00 2001 From: Mysticate Date: Wed, 30 Sep 2015 18:35:56 -0400 Subject: [PATCH] Peace of mind stuff. --- .../game/arcade/game/games/monstermaze/Maze.java | 11 +++++++++++ .../games/monstermaze/kits/perks/PerkRepulsor.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java index 0e5218c3e..92c8d73fc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java @@ -641,6 +641,17 @@ public class Maze implements Listener _movementWaypointsDisabled.add(cur); } + for (Iterator it = _ents.keySet().iterator() ; it.hasNext() ;) + { + LivingEntity en = it.next(); + + if (!_nextSafePad.isOn(en)) + continue; + + it.remove(); + en.remove(); + } + Bukkit.getPluginManager().callEvent(new SafepadBuildEvent()); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/kits/perks/PerkRepulsor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/kits/perks/PerkRepulsor.java index df37b2826..cae108d5b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/kits/perks/PerkRepulsor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/kits/perks/PerkRepulsor.java @@ -65,7 +65,7 @@ public class PerkRepulsor extends Perk for (Entity ent : UtilEnt.getInRadius(player.getLocation(), 6).keySet()) { - if (!(ent instanceof Player) && !(ent instanceof LivingEntity)) + if (ent instanceof Player || !(ent instanceof LivingEntity)) continue; ent.playEffect(EntityEffect.HURT);