Merge branch 'laci200270-patch-1'
This commit is contained in:
commit
4315637f75
|
@ -20,7 +20,12 @@ public class FMLSecurityManager extends SecurityManager {
|
||||||
String callingClass = classContexts.length > 3 ? classContexts[4].getName() : "none";
|
String callingClass = classContexts.length > 3 ? classContexts[4].getName() : "none";
|
||||||
String callingParent = classContexts.length > 4 ? classContexts[5].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)
|
// 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();
|
throw new ExitTrappedException();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue