From 3a2e932d171a51f23af96bd90a7020dd2211ffde Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Sun, 28 Jun 2020 18:45:40 -0400 Subject: [PATCH] Add missing mobs from 1.13.2+ --- .../com/plotsquared/bukkit/BukkitMain.java | 214 +++++++++--------- 1 file changed, 110 insertions(+), 104 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index ca21d9a3d..95ceed2de 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -627,46 +627,46 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain< Iterator iterator = entities.iterator(); while (iterator.hasNext()) { Entity entity = iterator.next(); - switch (entity.getType()) { - case EGG: - case FISHING_HOOK: - case ENDER_SIGNAL: - case AREA_EFFECT_CLOUD: - case EXPERIENCE_ORB: - case LEASH_HITCH: - case FIREWORK: - case LIGHTNING: - case WITHER_SKULL: - case UNKNOWN: - case PLAYER: + switch (entity.getType().toString()) { + case "EGG": + case "FISHING_HOOK": + case "ENDER_SIGNAL": + case "AREA_EFFECT_CLOUD": + case "EXPERIENCE_ORB": + case "LEASH_HITCH": + case "FIREWORK": + case "LIGHTNING": + case "WITHER_SKULL": + case "UNKNOWN": + case "PLAYER": // non moving / unmovable continue; - case THROWN_EXP_BOTTLE: - case SPLASH_POTION: - case SNOWBALL: - case SHULKER_BULLET: - case SPECTRAL_ARROW: - case ENDER_PEARL: - case ARROW: - case LLAMA_SPIT: - case TRIDENT: + case "THROWN_EXP_BOTTLE": + case "SPLASH_POTION": + case "SNOWBALL": + case "SHULKER_BULLET": + case "SPECTRAL_ARROW": + case "ENDER_PEARL": + case "ARROW": + case "LLAMA_SPIT": + case "TRIDENT": // managed elsewhere | projectile continue; - case ITEM_FRAME: - case PAINTING: + case "ITEM_FRAME": + case "PAINTING": // Not vehicles continue; - case ARMOR_STAND: + case "ARMOR_STAND": // Temporarily classify as vehicle - case MINECART: - case MINECART_CHEST: - case MINECART_COMMAND: - case MINECART_FURNACE: - case MINECART_HOPPER: - case MINECART_MOB_SPAWNER: - case ENDER_CRYSTAL: - case MINECART_TNT: - case BOAT: + case "MINECART": + case "MINECART_CHEST": + case "MINECART_COMMAND": + case "MINECART_FURNACE": + case "MINECART_HOPPER": + case "MINECART_MOB_SPAWNER": + case "ENDER_CRYSTAL": + case "MINECART_TNT": + case "BOAT": if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { com.plotsquared.core.location.Location location = BukkitUtil.getLocation(entity.getLocation()); @@ -695,10 +695,10 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain< } } continue; - case SMALL_FIREBALL: - case FIREBALL: - case DRAGON_FIREBALL: - case DROPPED_ITEM: + case "SMALL_FIREBALL": + case "FIREBALL": + case "DRAGON_FIREBALL": + case "DROPPED_ITEM": if (Settings.Enabled_Components.KILL_ROAD_ITEMS && plotArea .getOwnedPlotAbs(BukkitUtil.getLocation(entity.getLocation())) == null) { @@ -706,11 +706,11 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain< } // dropped item continue; - case PRIMED_TNT: - case FALLING_BLOCK: + case "PRIMED_TNT": + case "FALLING_BLOCK": // managed elsewhere continue; - case SHULKER: + case "SHULKER": if (Settings.Enabled_Components.KILL_ROAD_MOBS) { LivingEntity livingEntity = (LivingEntity) entity; List meta = entity.getMetadata("shulkerPlot"); @@ -758,70 +758,76 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain< } } continue; - case LLAMA: - case DONKEY: - case MULE: - case ZOMBIE_HORSE: - case SKELETON_HORSE: - case HUSK: - case ELDER_GUARDIAN: - case WITHER_SKELETON: - case STRAY: - case ZOMBIE_VILLAGER: - case EVOKER: - case EVOKER_FANGS: - case VEX: - case VINDICATOR: - case POLAR_BEAR: - case BAT: - case BLAZE: - case CAVE_SPIDER: - case CHICKEN: - case COW: - case CREEPER: - case ENDERMAN: - case ENDERMITE: - case ENDER_DRAGON: - case GHAST: - case GIANT: - case GUARDIAN: - case HORSE: - case IRON_GOLEM: - case MAGMA_CUBE: - case MUSHROOM_COW: - case OCELOT: - case PIG: - case RABBIT: - case SHEEP: - case SILVERFISH: - case SKELETON: - case SLIME: - case SNOWMAN: - case SPIDER: - case SQUID: - case VILLAGER: - case WITCH: - case WITHER: - case WOLF: - case ZOMBIE: - case PARROT: - case SALMON: - case DOLPHIN: - case TROPICAL_FISH: - case DROWNED: - case COD: - case TURTLE: - case PUFFERFISH: - case PHANTOM: - case ILLUSIONER: - case CAT: - case PANDA: - case FOX: - case PILLAGER: - case TRADER_LLAMA: - case WANDERING_TRADER: - case RAVAGER: - //case BEE: + case "ZOMBIFIED_PIGLIN": + case "LLAMA": + case "DONKEY": + case "MULE": + case "ZOMBIE_HORSE": + case "SKELETON_HORSE": + case "HUSK": + case "ELDER_GUARDIAN": + case "WITHER_SKELETON": + case "STRAY": + case "ZOMBIE_VILLAGER": + case "EVOKER": + case "EVOKER_FANGS": + case "VEX": + case "VINDICATOR": + case "POLAR_BEAR": + case "BAT": + case "BLAZE": + case "CAVE_SPIDER": + case "CHICKEN": + case "COW": + case "CREEPER": + case "ENDERMAN": + case "ENDERMITE": + case "ENDER_DRAGON": + case "GHAST": + case "GIANT": + case "GUARDIAN": + case "HORSE": + case "IRON_GOLEM": + case "MAGMA_CUBE": + case "MUSHROOM_COW": + case "OCELOT": + case "PIG": + case "PIG_ZOMBIE": + case "RABBIT": + case "SHEEP": + case "SILVERFISH": + case "SKELETON": + case "SLIME": + case "SNOWMAN": + case "SPIDER": + case "SQUID": + case "VILLAGER": + case "WITCH": + case "WITHER": + case "WOLF": + case "ZOMBIE": + case "PARROT": + case "SALMON": + case "DOLPHIN": + case "TROPICAL_FISH": + case "DROWNED": + case "COD": + case "TURTLE": + case "PUFFERFISH": + case "PHANTOM": + case "ILLUSIONER": + case "CAT": + case "PANDA": + case "FOX": + case "PILLAGER": + case "TRADER_LLAMA": + case "WANDERING_TRADER": + case "RAVAGER": + case "BEE": + case "HOGLIN": + case "PIGLIN": + case "ZOGLIN": + break; default: { if (Settings.Enabled_Components.KILL_ROAD_MOBS) { Location location = entity.getLocation();