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

Move placement of single player world load hook to fix NPEs.

Browse Source
This commit is contained in:
Lex Manos committed 2014-01-18 13:05:18 -08:00
1 parent 2a5a8d0cd0
commit 444a7d7fa1
3 files changed
+11 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/cpw/mods/fml/client/FMLClientHandler.java
+2 -3
View File
@@ -28,7 +28,6 @@ import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiIngameMenu;
import net.minecraft.client.gui.GuiMainMenu;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiSelectWorld;
import net.minecraft.client.gui.ServerListEntryNormal;
import net.minecraft.client.multiplayer.GuiConnecting;
import net.minecraft.client.multiplayer.ServerData;
@@ -49,6 +48,7 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.ServerStatusResponse;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.WorldSettings;
import org.apache.logging.log4j.Level;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
@@ -554,10 +554,9 @@ public class FMLClientHandler implements IFMLSidedHandler
}
}
public void tryLoadWorld(GuiSelectWorld selectWorldGUI, int selectedIndex)
public void startIntegratedServer(String id, String name, WorldSettings settings)
{
playClientBlock = new CountDownLatch(1);
selectWorldGUI.func_146615_e(selectedIndex);
}
public void showInGameModOptions(GuiIngameMenu guiIngameMenu)