TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-14 21:22:09 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup of god mode effects, suggested by gravypod.

Browse source
This commit is contained in:
KHobbits 2012-09-28 20:45:56 +01:00
parent 46d3f0827a
commit db6512b702
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
View file

@ -49,7 +49,7 @@ public class EssentialsEntityListener implements Listener
{ {
event.setCancelled(true); event.setCancelled(true);
} }
if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp")) if (attacker.isGodModeEnabled() && !attacker.isAuthorized("essentials.god.pvp"))
{ {
event.setCancelled(true); event.setCancelled(true);
@ -168,11 +168,16 @@ public class EssentialsEntityListener implements Listener
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPotionSplashEvent(final PotionSplashEvent event) public void onPotionSplashEvent(final PotionSplashEvent event)
{ {
LivingEntity[] entities = event.getAffectedEntities().toArray(new LivingEntity[event.getAffectedEntities().size()]); for (LivingEntity entity : event.getAffectedEntities())
for(int i = 0; i < entities.length; i++)
{ {
if (entities[i] instanceof Player && ess.getUser(entities[i]).isGodModeEnabled()) if (entity instanceof Player)
event.setIntensity(entities[i], 0); {
User user = ess.getUser(entity);
if (user.isGodModeEnabled())
{
event.setIntensity(entity, 0d);
}
}
} }
} }
} }