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

Fixed PvP immune players attacking pets.

Browse Source
This commit is contained in:
ryanhamshire 2015-03-28 12:56:57 -07:00
parent d15da5d02c
commit 123fc4c284
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -677,7 +677,7 @@ class EntityEventHandler implements Listener
if ((subEvent.getEntity() instanceof Creature && GriefPrevention.instance.config_claims_protectCreatures)) if ((subEvent.getEntity() instanceof Creature && GriefPrevention.instance.config_claims_protectCreatures))
{ {
//if entity is tameable and has an owner, apply special rules //if entity is tameable and has an owner, apply special rules
if(subEvent.getEntity() instanceof Tameable && !GriefPrevention.instance.config_pvp_enabledWorlds.contains(subEvent.getEntity().getWorld())) if(subEvent.getEntity() instanceof Tameable)
{ {
Tameable tameable = (Tameable)subEvent.getEntity(); Tameable tameable = (Tameable)subEvent.getEntity();
if(tameable.isTamed() && tameable.getOwner() != null) if(tameable.isTamed() && tameable.getOwner() != null)
@ -706,6 +706,13 @@ class EntityEventHandler implements Listener
GriefPrevention.sendMessage(attacker, TextMode.Err, message); GriefPrevention.sendMessage(attacker, TextMode.Err, message);
event.setCancelled(true); event.setCancelled(true);
return; return;
}
//and disallow if attacker is pvp immune
else if(attackerData.pvpImmune)
{
event.setCancelled(true);
GriefPrevention.sendMessage(attacker, TextMode.Err, Messages.CantFightWhileImmune);
return;
} }
} }
} }