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

Merge pull request #284 from smcv/uninit

Browse Source 
Fix NPE when loading second single-player world
This commit is contained in:
cpw committed 2013-09-22 18:24:56 -07:00
2 parents 79c39f8b7c 4a94c2c71b
commit 0e80fcb8f7
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
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");
}
}
}