From ba8ae538679d8bb7e39600ba7cdad59eb8b73595 Mon Sep 17 00:00:00 2001 From: laci200270 Date: Wed, 19 Aug 2015 20:27:42 +0200 Subject: [PATCH] Update FMLSecurityManager.java --- .../net/minecraftforge/fml/relauncher/FMLSecurityManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/fml/relauncher/FMLSecurityManager.java b/src/main/java/net/minecraftforge/fml/relauncher/FMLSecurityManager.java index f2cdc0615..a28228187 100644 --- a/src/main/java/net/minecraftforge/fml/relauncher/FMLSecurityManager.java +++ b/src/main/java/net/minecraftforge/fml/relauncher/FMLSecurityManager.java @@ -20,7 +20,7 @@ public class FMLSecurityManager extends SecurityManager { String callingClass = classContexts.length > 3 ? classContexts[4].getName() : "none"; String callingParent = classContexts.length > 4 ? classContexts[5].getName() : "none"; // FML is allowed to call system exit and the Minecraft applet (from the quit button) - if (!(callingClass.startsWith("net.minecraftforge.fml.") || ( "net.minecraft.client.Minecraft".equals(callingClass) && "net.minecraft.client.Minecraft".equals(callingParent)) || ("net.minecraft.server.dedicated.DedicatedServer".equals(callingClass) && "net.minecraft.server.MinecraftServer".equals(callingParent)))) + if (!(callingClass.startsWith("net.minecraftforge.fml.") || "net.minecraft.server.dedicated.ServerHangWatchdog$1".equals(callingClass) || "net.minecraft.server.dedicated.ServerHangWatchdog".equals(callingClass) || ( "net.minecraft.client.Minecraft".equals(callingClass) && "net.minecraft.client.Minecraft".equals(callingParent)) || ("net.minecraft.server.dedicated.DedicatedServer".equals(callingClass) && "net.minecraft.server.MinecraftServer".equals(callingParent)))) { throw new ExitTrappedException(); }