From c369a6ee9635d1411b007a3744a0a3d540af5353 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Fri, 28 Sep 2012 20:45:56 +0100 Subject: [PATCH] Cleanup of god mode effects, suggested by gravypod. --- .../essentials/EssentialsEntityListener.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java index aa23970bc..0dfff355c 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java @@ -49,7 +49,7 @@ public class EssentialsEntityListener implements Listener { event.setCancelled(true); } - + if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp")) { event.setCancelled(true); @@ -168,11 +168,16 @@ public class EssentialsEntityListener implements Listener @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onPotionSplashEvent(final PotionSplashEvent event) { - LivingEntity[] entities = event.getAffectedEntities().toArray(new LivingEntity[event.getAffectedEntities().size()]); - for(int i = 0; i < entities.length; i++) + for (LivingEntity entity : event.getAffectedEntities()) { - if (entities[i] instanceof Player && ess.getUser(entities[i]).isGodModeEnabled()) - event.setIntensity(entities[i], 0); + if (entity instanceof Player) + { + User user = ess.getUser(entity); + if (user.isGodModeEnabled()) + { + event.setIntensity(entity, 0d); + } + } } } -} +}