diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar
index ab90b82..6dc8500 100644
Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ
diff --git a/src/main/java/net/minecraft/src/GuiNewChat.java b/src/main/java/net/minecraft/src/GuiNewChat.java
index 73b3442..7d0b313 100644
--- a/src/main/java/net/minecraft/src/GuiNewChat.java
+++ b/src/main/java/net/minecraft/src/GuiNewChat.java
@@ -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)
diff --git a/src/main/java/net/minecraft/src/Minecraft.java b/src/main/java/net/minecraft/src/Minecraft.java
index 1b451c6..04f8632 100644
--- a/src/main/java/net/minecraft/src/Minecraft.java
+++ b/src/main/java/net/minecraft/src/Minecraft.java
@@ -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);
             }