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

Fixed dispenser projectiles vs claimed animals.

Browse Source
This commit is contained in:
ryanhamshire 2015-02-09 18:53:27 -08:00
parent ac0a87124f
commit c0a99f9e59
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -718,7 +718,7 @@ class EntityEventHandler implements Listener
PlayerData playerData = null; PlayerData playerData = null;
//if not a player or an explosive, allow //if not a player or an explosive, allow
if(attacker == null && damageSource != null && damageSource.getType() != EntityType.CREEPER && !(damageSource instanceof Explosive)) if(attacker == null && damageSource != null && !(damageSource instanceof Projectile) && damageSource.getType() != EntityType.CREEPER && !(damageSource instanceof Explosive))
{ {
return; return;
} }
@ -739,7 +739,7 @@ class EntityEventHandler implements Listener
if(attacker == null) if(attacker == null)
{ {
//exception case //exception case
if(event.getEntity() instanceof Villager && damageSource != null && damageSource instanceof Monster && claim.isAdminClaim()) if(event.getEntity() instanceof Villager && damageSource != null && damageSource instanceof Monster)
{ {
return; return;
} }
@ -748,6 +748,10 @@ class EntityEventHandler implements Listener
else else
{ {
event.setCancelled(true); event.setCancelled(true);
if(damageSource != null && damageSource instanceof Projectile)
{
damageSource.remove();
}
} }
} }