Fix isFML check (#404)

* Fix isFML check Signed-off-by: Jocelyn Castellano <[email protected]> * Swap order of if params --------- Signed-off-by: Jocelyn Castellano <[email protected]> Co-authored-by: My-Name-Is-Jeff <[email protected]>
Skytils · Aug 5, 2023 · c6f205c · c6f205c
1 parent 42bf84d
commit c6f205c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/gg/skytils/skytilsmod/tweaker/SkytilsTweaker.java b/src/main/java/gg/skytils/skytilsmod/tweaker/SkytilsTweaker.java
@@ -33,8 +33,8 @@ public class SkytilsTweaker extends EssentialSetupTweaker {
 
     public SkytilsTweaker() throws Throwable {
         runStage("gg.skytils.skytilsmod.utils.SuperSecretSettings", "load");
-        boolean isFML = System.getSecurityManager().getClass().equals(FMLSecurityManager.class);
-        if (System.getProperty("skytils.noSecurityManager") == null && (isFML || System.getSecurityManager().getClass() == SecurityManager.class || System.getSecurityManager() == null)) {
+        boolean isFML = System.getSecurityManager() != null && System.getSecurityManager().getClass().equals(FMLSecurityManager.class);
+        if (System.getProperty("skytils.noSecurityManager") == null && (System.getSecurityManager() == null || isFML || System.getSecurityManager().getClass() == SecurityManager.class)) {
             System.out.println("Skytils is setting the security manager to prevent 'ghost windows'... Set the flag skytils.noSecurityManager to prevent this behavior.");
             overrideSecurityManager(isFML);
             runStage("gg.skytils.skytilsmod.tweaker.SkytilsSecurityManager", "overrideSecurityManager", isFML);