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

Fix mobs not being able to attack players regardless of permission.

Browse Source 
Fixes WORLDGUARD-3172.
This commit is contained in:
sk89q 2014-08-31 18:28:50 -07:00
parent 6d5d9934cc
commit 125595e6b9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
View File

@ -401,12 +401,13 @@ public void onDamageEntity(DamageEntityEvent event) {
RegionAssociable associable = createRegionAssociable(event.getCause());
RegionQuery query = getPlugin().getRegionContainer().createQuery();
Object rootCause = event.getCause().getRootCause();
Player attacker;
boolean canDamage;
String what;
/* Hostile / ambient mob override */
if (Entities.isHostile(event.getEntity()) || Entities.isAmbient(event.getEntity())) {
if (isWhitelistedEntity(event.getEntity()) || (rootCause instanceof Entity && isWhitelistedEntity((Entity) rootCause))) {
canDamage = true;
what = "hit that";
@ -465,4 +466,8 @@ public void onVehicleExit(VehicleExitEvent event) {
}
}
private boolean isWhitelistedEntity(Entity entity) {
return Entities.isHostile(entity) || Entities.isAmbient(entity);
}
}