Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-24 03:25:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix a few wolf issues

Browse Source
This commit is contained in:
Wizjany 2013-01-31 08:23:38 -05:00
parent 5085841d9d
commit dfb6114584
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -337,13 +337,17 @@ private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
} else if (attacker instanceof Tameable) { }
if (attacker instanceof Tameable) {
if (((Tameable) attacker).getOwner() == null) { if (((Tameable) attacker).getOwner() == null) {
if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) { if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
} }
if (!(((Tameable) attacker).getOwner() instanceof Player)) {
return;
}
Player beastMaster = (Player) ((Tameable) attacker).getOwner(); Player beastMaster = (Player) ((Tameable) attacker).getOwner();
Vector pt2 = toVector(attacker.getLocation()); Vector pt2 = toVector(attacker.getLocation());
if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer(beastMaster))) { if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer(beastMaster))) {