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

Properly protect chest_boats as vehicles

Browse Source
This commit is contained in:
Joo200 2022-07-07 21:04:44 +02:00
parent 6efdb1089e
commit 0d2ed8205f
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,8 +101,20 @@ public static boolean isRiddenOnUse(Entity entity) {
* @return true if the type is a vehicle type * @return true if the type is a vehicle type
*/ */
public static boolean isVehicle(EntityType type) { public static boolean isVehicle(EntityType type) {
return type == EntityType.BOAT return isBoat(type) || isMinecart(type);
|| isMinecart(type); }
/**
* Test whether the given entity type is a Boat type.
*
* @param type the type
* @return true if the type is a Boat type
*/
public static boolean isBoat(EntityType type) {
return switch(type) {
case BOAT, CHEST_BOAT -> true;
default -> false;
};
} }
/** /**
@ -112,13 +124,11 @@ public static boolean isVehicle(EntityType type) {
* @return true if the type is a Minecart type * @return true if the type is a Minecart type
*/ */
public static boolean isMinecart(EntityType type) { public static boolean isMinecart(EntityType type) {
return type == EntityType.MINECART return switch(type) {
|| type == EntityType.MINECART_CHEST case MINECART, MINECART_CHEST, MINECART_COMMAND, MINECART_FURNACE,
|| type == EntityType.MINECART_COMMAND MINECART_HOPPER, MINECART_MOB_SPAWNER, MINECART_TNT -> true;
|| type == EntityType.MINECART_FURNACE default -> false;
|| type == EntityType.MINECART_HOPPER };
|| type == EntityType.MINECART_MOB_SPAWNER
|| type == EntityType.MINECART_TNT;
} }
/** /**