Peace of mind stuff.

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<LivingEntity> it = _ents.keySet().iterator() ; it.hasNext() ;)
+		{
+			LivingEntity en = it.next();
+			
+			if (!_nextSafePad.isOn(en))
+				continue;
+			
+			it.remove();
+			en.remove();
+		}
+		
 		Bukkit.getPluginManager().callEvent(new SafepadBuildEvent());
 	}
 	

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);