Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-08 01:17:49 +01:00
Code Issues Projects Releases Wiki Activity

Only check ride flag for pigs with saddles.

Browse Source
This commit is contained in:
wizjany 2019-06-19 23:22:21 -04:00
parent fe4f0cfc49
commit ff7209a58b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.entity.Monster; import org.bukkit.entity.Monster;
import org.bukkit.entity.NPC; import org.bukkit.entity.NPC;
import org.bukkit.entity.Pig;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
import org.bukkit.entity.Shulker; import org.bukkit.entity.Shulker;
@ -41,7 +42,6 @@
import org.bukkit.entity.Tameable; import org.bukkit.entity.Tameable;
import org.bukkit.entity.TippedArrow; import org.bukkit.entity.TippedArrow;
import org.bukkit.entity.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.entity.WaterMob;
import org.bukkit.entity.minecart.ExplosiveMinecart; import org.bukkit.entity.minecart.ExplosiveMinecart;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.projectiles.ProjectileSource; import org.bukkit.projectiles.ProjectileSource;
@ -91,7 +91,7 @@ public static boolean isFireball(EntityType type) {
* @return true if the entity can be ridden * @return true if the entity can be ridden
*/ */
public static boolean isRiddenOnUse(Entity entity) { public static boolean isRiddenOnUse(Entity entity) {
return entity instanceof Vehicle; return entity instanceof Pig ? ((Pig) entity).hasSaddle() : entity instanceof Vehicle;
} }
/** /**
@ -163,8 +163,7 @@ public static boolean isHostile(Entity entity) {
* @return true if non-hostile * @return true if non-hostile
*/ */
public static boolean isNonHostile(Entity entity) { public static boolean isNonHostile(Entity entity) {
return !isHostile(entity) return !isHostile(entity) && entity instanceof Creature;
&& (entity instanceof Creature || entity instanceof WaterMob);
} }
/** /**