upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/3125' into 1.10.x

Browse Source
This commit is contained in:
cpw committed 2016-07-28 18:25:45 -04:00
2 parents bc82f2ae5a b0fd97557e
commit 5d9169db0f
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/minecraftforge/fml/relauncher/FMLSecurityManager.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class FMLSecurityManager extends SecurityManager {
if (permName.startsWith("exitVM"))
{
Class<?>[] classContexts = getClassContext();
String callingClass = classContexts.length > 3 ? classContexts[4].getName() : "none";
String callingParent = classContexts.length > 4 ? classContexts[5].getName() : "none";
String callingClass = classContexts.length > 4 ? classContexts[4].getName() : "none";
String callingParent = classContexts.length > 5 ? 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.server.dedicated.ServerHangWatchdog$1".equals(callingClass)