Hotfixes
This commit is contained in:
parent
6f88142730
commit
a2d44c8db3
Binary file not shown.
|
@ -151,7 +151,7 @@ public class GuiNewChat extends Gui
|
|||
public void printChatMessageWithOptionalDeletion(String par1Str, int par2)
|
||||
{
|
||||
this.func_96129_a(par1Str, par2, this.mc.ingameGUI.getUpdateCounter(), false);
|
||||
System.out.println("[CHAT] " + EnumChatFormatting.func_110646_a(par1Str));
|
||||
System.out.println("[CHAT] " + par1Str);
|
||||
}
|
||||
|
||||
private void func_96129_a(String par1Str, int par2, int par3, boolean par4)
|
||||
|
|
|
@ -532,42 +532,32 @@ public class Minecraft
|
|||
*/
|
||||
public void displayGuiScreen(GuiScreen par1GuiScreen)
|
||||
{
|
||||
if (this.currentScreen != null)
|
||||
{
|
||||
if (this.currentScreen != null) {
|
||||
this.currentScreen.onGuiClosed();
|
||||
}
|
||||
|
||||
//this.statFileWriter.syncStats();
|
||||
|
||||
if (par1GuiScreen == null && this.theWorld == null)
|
||||
{
|
||||
if (par1GuiScreen == null && this.theWorld == null) {
|
||||
par1GuiScreen = new GuiMainMenu();
|
||||
}
|
||||
else if (par1GuiScreen == null && this.thePlayer.getHealth() <= 0.0F)
|
||||
{
|
||||
} else if (par1GuiScreen == null && this.thePlayer.getHealth() <= 0) {
|
||||
par1GuiScreen = new GuiGameOver();
|
||||
}
|
||||
|
||||
if (par1GuiScreen instanceof GuiMainMenu)
|
||||
{
|
||||
if (par1GuiScreen instanceof GuiMainMenu) {
|
||||
this.gameSettings.showDebugInfo = false;
|
||||
this.ingameGUI.getChatGUI().clearChatMessages();
|
||||
}
|
||||
|
||||
this.currentScreen = (GuiScreen)par1GuiScreen;
|
||||
this.currentScreen = (GuiScreen) par1GuiScreen;
|
||||
|
||||
if (par1GuiScreen != null)
|
||||
{
|
||||
if (par1GuiScreen != null) {
|
||||
this.setIngameNotInFocus();
|
||||
ScaledResolution var2 = new ScaledResolution(this.gameSettings, this.displayWidth, this.displayHeight);
|
||||
int var3 = var2.getScaledWidth();
|
||||
int var4 = var2.getScaledHeight();
|
||||
((GuiScreen)par1GuiScreen).setWorldAndResolution(this, var3, var4);
|
||||
((GuiScreen) par1GuiScreen).setWorldAndResolution(this, var3, var4);
|
||||
this.skipRenderWorld = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.setIngameFocus();
|
||||
} else {
|
||||
if(!this.inGameHasFocus) this.setIngameFocus();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -949,7 +939,7 @@ public class Minecraft
|
|||
{
|
||||
this.inGameHasFocus = true;
|
||||
this.mouseHelper.grabMouseCursor();
|
||||
this.displayGuiScreen((GuiScreen)null);
|
||||
this.displayGuiScreen((GuiScreen) null);
|
||||
this.leftClickCounter = 10000;
|
||||
}
|
||||
|
||||
|
@ -1610,7 +1600,6 @@ public class Minecraft
|
|||
*/
|
||||
public void loadWorld(WorldClient par1WorldClient, String par2Str) {
|
||||
if (par1WorldClient == null) {
|
||||
System.out.println("worldClient is null");
|
||||
NetClientHandler var3 = this.getNetHandler();
|
||||
|
||||
if (var3 != null) {
|
||||
|
@ -1624,7 +1613,6 @@ public class Minecraft
|
|||
this.myNetworkManager = null;
|
||||
|
||||
}
|
||||
System.out.println("worldClient not null");
|
||||
this.renderViewEntity = null;
|
||||
|
||||
if (this.loadingScreen != null) {
|
||||
|
@ -1650,7 +1638,6 @@ public class Minecraft
|
|||
this.theWorld = par1WorldClient;
|
||||
|
||||
if (par1WorldClient != null) {
|
||||
System.out.println("doing rendering shit");
|
||||
if (this.renderGlobal != null) {
|
||||
this.renderGlobal.setWorldAndLoadRenderers(par1WorldClient);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue