Fix bug with SSP, and hook so we can do confirmation of world loading, as well as other things
This commit is contained in:
parent
971289194c
commit
b70742e72d
|
@ -0,0 +1,27 @@
|
||||||
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
|
||||||
|
@@ -1,5 +1,6 @@
|
||||||
|
package net.minecraft.client.gui;
|
||||||
|
|
||||||
|
+import cpw.mods.fml.client.FMLClientHandler;
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
import java.text.DateFormat;
|
||||||
|
@@ -126,7 +127,7 @@
|
||||||
|
}
|
||||||
|
else if (p_146284_1_.field_146127_k == 1)
|
||||||
|
{
|
||||||
|
- this.func_146615_e(this.field_146640_r);
|
||||||
|
+ FMLClientHandler.instance().tryLoadWorld(this,this.field_146640_r);
|
||||||
|
}
|
||||||
|
else if (p_146284_1_.field_146127_k == 3)
|
||||||
|
{
|
||||||
|
@@ -253,7 +254,7 @@
|
||||||
|
|
||||||
|
if (p_148144_2_ && flag1)
|
||||||
|
{
|
||||||
|
- GuiSelectWorld.this.func_146615_e(p_148144_1_);
|
||||||
|
+ FMLClientHandler.instance().tryLoadWorld(GuiSelectWorld.this,p_148144_1_);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -548,6 +548,7 @@ public class FMLClientHandler implements IFMLSidedHandler
|
||||||
|
|
||||||
public void tryLoadWorld(GuiSelectWorld selectWorldGUI, int selectedIndex)
|
public void tryLoadWorld(GuiSelectWorld selectWorldGUI, int selectedIndex)
|
||||||
{
|
{
|
||||||
|
playClientBlock = new CountDownLatch(1);
|
||||||
selectWorldGUI.func_146615_e(selectedIndex);
|
selectWorldGUI.func_146615_e(selectedIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue