From b51a4cbf8a99334c6b9ba63105787f8f20b5b838 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Sun, 20 Mar 2016 19:51:33 -0700 Subject: [PATCH] Fixed lingering potion of harm grief. Doesn't damage protected entities (like claimed animals). --- src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index a97aedd..21e028b 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -822,6 +822,7 @@ public class EntityEventHandler implements Listener && damageSource != null && damageSource.getType() != EntityType.CREEPER && damageSource.getType() != EntityType.ENDER_CRYSTAL + && damageSource.getType() != EntityType.AREA_EFFECT_CLOUD && !(damageSource instanceof Projectile) && !(damageSource instanceof Explosive) && !(damageSource instanceof ExplosiveMinecart)) @@ -1049,6 +1050,7 @@ public class EntityEventHandler implements Listener for(PotionEffect effect : effects) { PotionEffectType effectType = effect.getType(); + //restrict some potions on claimed animals (griefers could use this to kill or steal animals over fences) if(effectType.getName().equals("JUMP") || effectType.getName().equals("POISON")) {