From 09f1df49a92e393726fbb295287ef1135ba974b9 Mon Sep 17 00:00:00 2001 From: DroppingAnvil Date: Thu, 25 Jun 2020 13:23:52 -0500 Subject: [PATCH] Begin 1.16 support --- src/main/java/com/massivecraft/factions/Conf.java | 2 +- src/main/java/com/massivecraft/factions/FactionsPlugin.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 543df599..49d77262 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -577,7 +577,7 @@ public class Conf { safeZoneNerfedCreatureTypes.add(EntityType.ENDERMAN); safeZoneNerfedCreatureTypes.add(EntityType.GHAST); safeZoneNerfedCreatureTypes.add(EntityType.MAGMA_CUBE); - safeZoneNerfedCreatureTypes.add(EntityType.PIG_ZOMBIE); + if (!FactionsPlugin.getInstance().mc116) safeZoneNerfedCreatureTypes.add(EntityType.PIG_ZOMBIE); safeZoneNerfedCreatureTypes.add(EntityType.SILVERFISH); safeZoneNerfedCreatureTypes.add(EntityType.SKELETON); safeZoneNerfedCreatureTypes.add(EntityType.SPIDER); diff --git a/src/main/java/com/massivecraft/factions/FactionsPlugin.java b/src/main/java/com/massivecraft/factions/FactionsPlugin.java index 03117e8d..01a228cd 100755 --- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java +++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java @@ -81,6 +81,7 @@ public class FactionsPlugin extends MPlugin { public boolean mc113 = false; public boolean mc114 = false; public boolean mc115 = false; + public boolean mc116 = false; public boolean useNonPacketParticles = false; public List itemList = getConfig().getStringList("fchest.Items-Not-Allowed"); SkriptAddon skriptAddon; @@ -167,6 +168,10 @@ public class FactionsPlugin extends MPlugin { FactionsPlugin.instance.log("Minecraft Version 1.15 found."); mc115 = true; break; + case 16: + FactionsPlugin.instance.log("Minecraft Version 1.16 found."); + mc116 = true; + break; } migrateFPlayerLeaders(); log("==== End Setup ====");