From 522de89792bbf9fb41ed65e0d87aaee7bf667863 Mon Sep 17 00:00:00 2001
From: RePixelatedMC <repixelatedmc@gmail.com>
Date: Sat, 4 Nov 2023 14:35:40 +0100
Subject: [PATCH] Fixed Crash on lower end servers + Cleanup

---
 .../java/com/volmit/iris/core/ServerConfigurator.java     | 5 ++---
 .../com/volmit/iris/engine/safeguard/IrisSafeguard.java   | 1 -
 .../com/volmit/iris/engine/safeguard/PerformanceSFG.java  | 8 +-------
 .../com/volmit/iris/engine/safeguard/ServerBootSFG.java   | 3 ---
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
index 58a05d43c..98a5fc7be 100644
--- a/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
+++ b/core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
@@ -61,13 +61,12 @@ public class ServerConfigurator {
         long tt = f.getLong("settings.timeout-time");
 
         if (tt < TimeUnit.MINUTES.toSeconds(5)) {
-            Iris.warn("Updating spigot.yml timeout-time: " + tt + " -> " + TimeUnit.MINUTES.toSeconds(5) + " (5 minutes)");
+            Iris.warn("Updating spigot.yml timeout-time: " + tt + " -> " + TimeUnit.MINUTES.toSeconds(20) + " (5 minutes)");
             Iris.warn("You can disable this change (autoconfigureServer) in Iris settings, then change back the value.");
             f.set("settings.timeout-time", TimeUnit.MINUTES.toSeconds(5));
             f.save(spigotConfig);
         }
     }
-
     private static void increasePaperWatchdog() throws IOException, InvalidConfigurationException {
         File spigotConfig = new File("config/paper-global.yml");
         FileConfiguration f = new YamlConfiguration();
@@ -75,7 +74,7 @@ public class ServerConfigurator {
         long tt = f.getLong("watchdog.early-warning-delay");
 
         if (tt < TimeUnit.MINUTES.toMillis(3)) {
-            Iris.warn("Updating paper.yml watchdog early-warning-delay: " + tt + " -> " + TimeUnit.MINUTES.toMillis(3) + " (3 minutes)");
+            Iris.warn("Updating paper.yml watchdog early-warning-delay: " + tt + " -> " + TimeUnit.MINUTES.toMillis(15) + " (3 minutes)");
             Iris.warn("You can disable this change (autoconfigureServer) in Iris settings, then change back the value.");
             f.set("watchdog.early-warning-delay", TimeUnit.MINUTES.toMillis(3));
             f.save(spigotConfig);
diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java b/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java
index 351c46e78..218fc4845 100644
--- a/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java
+++ b/core/src/main/java/com/volmit/iris/engine/safeguard/IrisSafeguard.java
@@ -8,7 +8,6 @@ public class IrisSafeguard {
     public static void IrisSafeguardSystem() {
         Iris.info("Enabled Iris SafeGuard");
         ServerBootSFG.BootCheck();
-        PerformanceSFG.calculatePerformance();
     }
 }
 
diff --git a/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java b/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java
index b97a7ec6b..35ea78a57 100644
--- a/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java
+++ b/core/src/main/java/com/volmit/iris/engine/safeguard/PerformanceSFG.java
@@ -1,5 +1,6 @@
 package com.volmit.iris.engine.safeguard;
 
+import com.volmit.iris.core.IrisSettings;
 import oshi.SystemInfo;
 import oshi.hardware.GlobalMemory;
 
@@ -9,13 +10,6 @@ public class PerformanceSFG {
    public static boolean lowPerformance = false;
     public static void calculatePerformance(){
 
-        if (getCPUModel().contains("Xeon")){
-            lowPerformance = true;
-        }
-        if (getProcessMemory() < 5999){
-            lowPerformance = true;
-        }
 
-        // Todo RePixelated: Finish this
     }
 }
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 25c4d3fae..e6e204472 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
@@ -37,15 +37,12 @@ public class ServerBootSFG {
         for (Plugin plugin : plugins) {
             pluginName = plugin.getName();
             Boolean flag = incompatiblePlugins.get(pluginName);
-            Iris.info("T65: " + pluginName);
             if (flag != null && !flag) {
                 count++;
                 incompatiblePlugins.put(pluginName, true);
             }
         }
 
-        Iris.info("TEST: " + incompatiblePlugins.get("Multiverse-Core"));
-
         StringJoiner joiner = new StringJoiner(", ");
         for (Map.Entry<String, Boolean> entry : incompatiblePlugins.entrySet()) {
             if (entry.getValue()) {