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

Improve entity detection in Entities utility class, add Entities.isNonPlayerCreature().

Browse Source
This commit is contained in:
sk89q 2014-11-10 23:52:26 -08:00
parent 25f12e9733
commit ba4e5d6ea9
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,9 +20,12 @@
package com.sk89q.worldguard.bukkit.util;
import org.bukkit.entity.Ambient;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Flying;
import org.bukkit.entity.Hanging;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Monster;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
@ -137,7 +140,10 @@ public static boolean isFakePlayer(Player player) {
* @return true if hostile
*/
public static boolean isHostile(Entity entity) {
return entity instanceof Monster || entity instanceof Slime;
return entity instanceof Monster
|| entity instanceof Slime
|| entity instanceof Flying
|| entity instanceof EnderDragon;
}
/**
@ -150,6 +156,17 @@ public static boolean isAmbient(Entity entity) {
return entity instanceof Ambient;
}
/**
* Test whether an entity is a creature (a living thing) that is
* not a player.
*
* @param entity the entity
* @return true if a non-player creature
*/
public static boolean isNonPlayerCreature(Entity entity) {
return entity instanceof LivingEntity && !(entity instanceof Player);
}
/**
* Test whether using the given entity should be considered "building"
* rather than merely using an entity.