From e7fc9e6fe5f7171b1a78f4d86074eaff06092d13 Mon Sep 17 00:00:00 2001 From: RePixelatedMC Date: Fri, 3 Nov 2023 08:28:19 +0100 Subject: [PATCH] Test --- .../iris/engine/safeguard/ServerBootSFG.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/ServerBootSFG.java b/core/src/main/java/com/volmit/iris/engine/safeguard/ServerBootSFG.java index e4b4978be..d75e3cbb1 100644 --- a/core/src/main/java/com/volmit/iris/engine/safeguard/ServerBootSFG.java +++ b/core/src/main/java/com/volmit/iris/engine/safeguard/ServerBootSFG.java @@ -9,7 +9,9 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import static com.volmit.iris.Iris.dump; import static com.volmit.iris.Iris.instance; @@ -34,30 +36,29 @@ public class ServerBootSFG { count++; } + // Why am i doing this again? + Map incompatiblePlugins = new HashMap<>(); + incompatiblePlugins.put("Multiverse-Core", multiverse); + incompatiblePlugins.put("Dynmap", dynmap); + incompatiblePlugins.put("TerraformGenerator", terraform); + incompatiblePlugins.put("Stratos", stratos); + StringBuilder pluginList = new StringBuilder("Plugin list: "); count = 0; for (Plugin plugin : plugins) { String pluginName = plugin.getName(); - if (pluginName.equalsIgnoreCase("Multiverse-Core")) { - multiverse = true; + Boolean flag = incompatiblePlugins.get(pluginName); + Iris.info("T65: " + pluginName); + if (flag != null && !flag) { count++; + incompatiblePlugins.put(pluginName, true); } - if (pluginName.equalsIgnoreCase("Dynmap")) { - dynmap = true; - count++; - } - if (pluginName.equalsIgnoreCase("TerraformGenerator")) { - terraform = true; - count++; - } - if (pluginName.equalsIgnoreCase("Stratos")) { - stratos = true; - count++; - } - pluginList.append(pluginName).append(", "); - Iris.safeguard(pluginList.toString()); + // pluginList.append(pluginName).append(", "); + // Iris.safeguard(pluginList.toString()); } + Iris.info("TEST:" + multiverse); + if ( !instance.getServer().getVersion().contains("Purpur") &&