From 110f4e2009073d39433a7e7e5e719733ed22990f Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Sun, 20 Mar 2016 13:51:19 -0700 Subject: [PATCH] Fixed ender crystals damaging protected animals. --- .../ryanhamshire/GriefPrevention/EntityEventHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index debac18..db50cda 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -817,7 +817,13 @@ public class EntityEventHandler implements Listener PlayerData playerData = null; //if not a player or an explosive, allow - if(attacker == null && damageSource != null && !(damageSource instanceof Projectile) && damageSource.getType() != EntityType.CREEPER && !(damageSource instanceof Explosive) && !(damageSource instanceof ExplosiveMinecart)) + if(attacker == null + && damageSource != null + && damageSource.getType() != EntityType.CREEPER + && damageSource.getType() != EntityType.ENDER_CRYSTAL + && !(damageSource instanceof Projectile) + && !(damageSource instanceof Explosive) + && !(damageSource instanceof ExplosiveMinecart)) { return; }