From 7c214496b7649a580b8eacd0070796f69193db6a Mon Sep 17 00:00:00 2001 From: Magnus Ulf Date: Mon, 25 Mar 2019 14:34:05 +0100 Subject: [PATCH] Update entity sets. Fixes #27 --- .../factions/engine/EngineFlagSpawn.java | 2 +- .../massivecraft/factions/util/EnumerationUtil.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/massivecraft/factions/engine/EngineFlagSpawn.java b/src/com/massivecraft/factions/engine/EngineFlagSpawn.java index 458db80e..1632a22b 100644 --- a/src/com/massivecraft/factions/engine/EngineFlagSpawn.java +++ b/src/com/massivecraft/factions/engine/EngineFlagSpawn.java @@ -37,6 +37,7 @@ public class EngineFlagSpawn extends Engine "NETHER_PORTAL", "MOUNT", "REINFORCEMENTS", + "VILLAGE_DEFENSE", "VILLAGE_INVASION" ); @@ -52,7 +53,6 @@ public class EngineFlagSpawn extends Engine // ... get the spawn location ... Location location = event.getLocation(); - if (location == null) return; PS ps = PS.valueOf(location); // ... get the faction there ... diff --git a/src/com/massivecraft/factions/util/EnumerationUtil.java b/src/com/massivecraft/factions/util/EnumerationUtil.java index 5b14e256..7c2c8d1a 100644 --- a/src/com/massivecraft/factions/util/EnumerationUtil.java +++ b/src/com/massivecraft/factions/util/EnumerationUtil.java @@ -209,7 +209,10 @@ public class EnumerationUtil "WITHER_SKELETON", "ZOMBIE", // Minecraft 1.? "ZOMBIE_VILLAGER", - "ILLUSIONER" // Minecraft 1.12 + "ILLUSIONER", // Minecraft 1.12 + "PHANTOM", // Minecraft 1.13 + "DOLPHIN", // Minecraft 1.13 + "DROWNED" // Minecraft 1.13 ); public static boolean isEntityTypeMonster(EntityType entityType) @@ -238,7 +241,12 @@ public class EnumerationUtil "SQUID", // Minecraft 1.? "WOLF", // Minecraft 1.? "ZOMBIE_HORSE", - "PARROT" // Minecraft 1.12 + "PARROT", // Minecraft 1.12 + "COD", // Minecraft 1.13 + "SALMON", // Minecraft 1.13 + "PUFFERFISH", // Minecraft 1.13 + "TROPICAL_FISH", // Minecraft 1.13 + "TURTLE" // Minecraft 1.13 ); public static boolean isEntityTypeAnimal(EntityType entityType)