Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update entity sets. Fixes #27

Browse Source
This commit is contained in:
Magnus Ulf 2019-03-25 14:34:05 +01:00
parent 7171d43a2a
commit 7c214496b7
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/engine/EngineFlagSpawn.java
View File

@ -37,6 +37,7 @@ public class EngineFlagSpawn extends Engine
"NETHER_PORTAL", "NETHER_PORTAL",
"MOUNT", "MOUNT",
"REINFORCEMENTS", "REINFORCEMENTS",
"VILLAGE_DEFENSE",
"VILLAGE_INVASION" "VILLAGE_INVASION"
); );
@ -52,7 +53,6 @@ public class EngineFlagSpawn extends Engine
// ... get the spawn location ... // ... get the spawn location ...
Location location = event.getLocation(); Location location = event.getLocation();
if (location == null) return;
PS ps = PS.valueOf(location); PS ps = PS.valueOf(location);
// ... get the faction there ... // ... get the faction there ...

12
src/com/massivecraft/factions/util/EnumerationUtil.java
View File

@ -209,7 +209,10 @@ public class EnumerationUtil
"WITHER_SKELETON", "WITHER_SKELETON",
"ZOMBIE", // Minecraft 1.? "ZOMBIE", // Minecraft 1.?
"ZOMBIE_VILLAGER", "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) public static boolean isEntityTypeMonster(EntityType entityType)
@ -238,7 +241,12 @@ public class EnumerationUtil
"SQUID", // Minecraft 1.? "SQUID", // Minecraft 1.?
"WOLF", // Minecraft 1.? "WOLF", // Minecraft 1.?
"ZOMBIE_HORSE", "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) public static boolean isEntityTypeAnimal(EntityType entityType)