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

Fix NPE when loading second single-player world

Browse Source 
After leaving a single-player world, getServer() can return null, resulting
in the stack trace below, "Fatal errors were detected during the
transition from SERVER_STOPPING to SERVER_ABOUT_TO_START",
"The ForgeModLoader state engine has become corrupted" and the client
getting stuck forever.

Exception in thread "Server thread" java.lang.NullPointerException
at cpw.mods.fml.client.FMLClientHandler.serverStopped(FMLClientHandler.java:620)
at cpw.mods.fml.common.FMLCommonHandler.handleServerStopped(FMLCommonHandler.java:468)
at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:471)
at net.minecraft.server.ThreadMinecraftServer.run(SourceFile:583)
This commit is contained in:
Simon McVittie committed 2013-09-22 16:56:24 +01:00
1 parent 85811a013d
commit 5bf7d3cb4b
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
fml/client/cpw/mods/fml/client/FMLClientHandler.java
+4 -2
View File
@@ -617,9 +617,11 @@ public class FMLClientHandler implements IFMLSidedHandler
public void serverStopped()
{
// If the server crashes during startup, it might hang the client- reset the client so it can abend properly.
if (!getServer().func_71200_ad())
MinecraftServer server = getServer();
if (server != null && !server.func_71200_ad())
{
ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, getServer(), true, "field_71296"+"_Q","serverIs"+"Running");
ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, true, "field_71296"+"_Q","serverIs"+"Running");
}
}
}