Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-28 22:57:29 +02:00
Code Issues Projects Releases Wiki Activity

Don't apply USE to hanging entities.

Browse Source
This commit is contained in:
sk89q 2014-08-29 21:51:55 -07:00
parent cb0844c64d
commit 841cc8e033
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,6 +370,11 @@ public void onUseEntity(UseEntityEvent event) {
canUse = true;
what = "use that";
/* Paintings, item frames, etc. */
} else if (Entities.isConsideredBuildingIfUsed(event.getEntity())) {
canUse = query.testBuild(target, associable);
what = "change that";
/* Everything else */
} else {
canUse = query.testBuild(target, associable, DefaultFlag.USE);
@ -400,6 +405,11 @@ public void onDamageEntity(DamageEntityEvent event) {
canDamage = true;
what = "hit that";
/* Paintings, item frames, etc. */
} else if (Entities.isConsideredBuildingIfUsed(event.getEntity())) {
canDamage = query.testBuild(target, associable);
what = "change that";
/* PVP */
} else if (event.getEntity() instanceof Player && (attacker = event.getCause().getFirstPlayer()) != null && !attacker.equals(event.getEntity())) {
Player defender = (Player) event.getEntity();

12
src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java
View File

@ -22,6 +22,7 @@
import org.bukkit.entity.Ambient;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Hanging;
import org.bukkit.entity.Monster;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
@ -149,4 +150,15 @@ public static boolean isAmbient(Entity entity) {
return entity instanceof Ambient;
}
/**
* Test whether using the given entity should be considered "building"
* rather than merely using an entity.
*
* @param entity the entity
* @return true if considered building
*/
public static boolean isConsideredBuildingIfUsed(Entity entity) {
return entity instanceof Hanging;
}
}