Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Wither spawns injuring protected entities.

Browse Source
This commit is contained in:
ryanhamshire 2016-07-05 20:05:41 -07:00
parent 7e3d66aa9c
commit 5cf3110824
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -804,7 +804,7 @@ public class EntityEventHandler implements Listener
//don't track in worlds where claims are not enabled //don't track in worlds where claims are not enabled
if(!GriefPrevention.instance.claimsEnabledForWorld(event.getEntity().getWorld())) return; if(!GriefPrevention.instance.claimsEnabledForWorld(event.getEntity().getWorld())) return;
//if the damaged entity is a claimed item frame or armor stand, the damager needs to be a player with container trust in the claim //if the damaged entity is a claimed item frame or armor stand, the damager needs to be a player with build trust in the claim
if(subEvent.getEntityType() == EntityType.ITEM_FRAME if(subEvent.getEntityType() == EntityType.ITEM_FRAME
|| subEvent.getEntityType() == EntityType.ARMOR_STAND || subEvent.getEntityType() == EntityType.ARMOR_STAND
|| subEvent.getEntityType() == EntityType.VILLAGER || subEvent.getEntityType() == EntityType.VILLAGER
@ -911,6 +911,7 @@ public class EntityEventHandler implements Listener
if(attacker == null if(attacker == null
&& damageSource != null && damageSource != null
&& damageSource.getType() != EntityType.CREEPER && damageSource.getType() != EntityType.CREEPER
&& damageSource.getType() != EntityType.WITHER
&& damageSource.getType() != EntityType.ENDER_CRYSTAL && damageSource.getType() != EntityType.ENDER_CRYSTAL
&& damageSource.getType() != EntityType.AREA_EFFECT_CLOUD && damageSource.getType() != EntityType.AREA_EFFECT_CLOUD
&& !(damageSource instanceof Projectile) && !(damageSource instanceof Projectile)
@ -1078,7 +1079,7 @@ public class EntityEventHandler implements Listener
} }
//if not a player and not an explosion, always allow //if not a player and not an explosion, always allow
if(attacker == null && damageSourceType != EntityType.CREEPER && damageSourceType != EntityType.PRIMED_TNT) if(attacker == null && damageSourceType != EntityType.CREEPER && damageSourceType != EntityType.WITHER && damageSourceType != EntityType.PRIMED_TNT)
{ {
return; return;
} }