From e94e53f3488631e7e4e723710518b8f062ec6a88 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Fri, 20 Nov 2015 10:44:29 +1100
Subject: [PATCH] Fix colour codes not being trimmed from own skin name,
 launcher should auto-focus to search box.

---
 ClassicalSharp/Blocks/BlockInfo.cs                  | 1 -
 ClassicalSharp/Entities/LocalPlayer.cs              | 7 +++----
 ClassicalSharp/Entities/NetPlayer.cs                | 2 +-
 ClassicalSharp/Network/NetworkProcessor.Original.cs | 3 ++-
 Launcher2/Gui/Screens/ClassiCubeServersScreen.cs    | 3 +++
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ClassicalSharp/Blocks/BlockInfo.cs b/ClassicalSharp/Blocks/BlockInfo.cs
index ff5406a31..fc5b97d43 100644
--- a/ClassicalSharp/Blocks/BlockInfo.cs
+++ b/ClassicalSharp/Blocks/BlockInfo.cs
@@ -113,7 +113,6 @@ namespace ClassicalSharp {
 				canPlace[tile] = true;
 				canDelete[tile] = true;
 			}
-			canPlace[(int)Block.Grass] = false;
 			canPlace[(int)Block.Lava] = false;
 			canPlace[(int)Block.Water] = false;
 			canPlace[(int)Block.StillLava] = false;
diff --git a/ClassicalSharp/Entities/LocalPlayer.cs b/ClassicalSharp/Entities/LocalPlayer.cs
index a96afe8f6..e822d9fdb 100644
--- a/ClassicalSharp/Entities/LocalPlayer.cs
+++ b/ClassicalSharp/Entities/LocalPlayer.cs
@@ -38,9 +38,9 @@ namespace ClassicalSharp {
 			get { return (float)GetMaxHeight( jumpVel ); }
 		}
 		
-		public LocalPlayer( Game window ) : base( window ) {
-			DisplayName = window.Username;
-			SkinName = window.Username;
+		public LocalPlayer( Game game ) : base( game ) {
+			DisplayName = game.Username;
+			SkinName = game.Username;
 			SkinIdentifier = "skin_" + SkinName;
 			InitRenderingData();
 		}
@@ -253,7 +253,6 @@ namespace ClassicalSharp {
 			Inventory inv = game.Inventory;
 			inv.CanPlace[(int)Block.Bedrock] = value == 0x64;
 			inv.CanDelete[(int)Block.Bedrock] = value == 0x64;
-			inv.CanPlace[(int)Block.Grass] = value == 0x64;
 
 			inv.CanPlace[(int)Block.Water] = value == 0x64;
 			inv.CanPlace[(int)Block.StillWater] = value == 0x64;
diff --git a/ClassicalSharp/Entities/NetPlayer.cs b/ClassicalSharp/Entities/NetPlayer.cs
index 4cd6faf8d..04becbd20 100644
--- a/ClassicalSharp/Entities/NetPlayer.cs
+++ b/ClassicalSharp/Entities/NetPlayer.cs
@@ -9,7 +9,7 @@ namespace ClassicalSharp {
 		int tickCount;		
 		public NetPlayer( string displayName, string skinName, Game game ) : base( game ) {
 			DisplayName = displayName;
-			SkinName = Utils.StripColours( skinName );
+			SkinName = skinName;
 			SkinIdentifier = "skin_" + SkinName;
 			InitRenderingData();
 		}
diff --git a/ClassicalSharp/Network/NetworkProcessor.Original.cs b/ClassicalSharp/Network/NetworkProcessor.Original.cs
index 43b2b15c8..3869877df 100644
--- a/ClassicalSharp/Network/NetworkProcessor.Original.cs
+++ b/ClassicalSharp/Network/NetworkProcessor.Original.cs
@@ -255,6 +255,7 @@ namespace ClassicalSharp {
 		}	
 		
 		void AddEntity( byte entityId, string displayName, string skinName, bool readPosition ) {
+			skinName = Utils.StripColours( skinName );
 			if( entityId != 0xFF ) {
 				Player oldPlayer = game.Players[entityId];
 				if( oldPlayer != null ) {
@@ -266,7 +267,7 @@ namespace ClassicalSharp {
 				game.AsyncDownloader.DownloadSkin( skinName );
 			} else {
 				game.LocalPlayer.SkinName = skinName;
-				game.LocalPlayer.SkinIdentifier = "skin_" + game.LocalPlayer.SkinName;
+				game.LocalPlayer.SkinIdentifier = "skin_" + skinName;
 				game.AsyncDownloader.DownloadSkin( skinName );
 			}
 			if( readPosition ) {
diff --git a/Launcher2/Gui/Screens/ClassiCubeServersScreen.cs b/Launcher2/Gui/Screens/ClassiCubeServersScreen.cs
index 7440b1c48..1e1660aa7 100644
--- a/Launcher2/Gui/Screens/ClassiCubeServersScreen.cs
+++ b/Launcher2/Gui/Screens/ClassiCubeServersScreen.cs
@@ -62,7 +62,10 @@ namespace Launcher2 {
 			base.Init();
 			game.Window.Mouse.WheelChanged += MouseWheelChanged;
 			game.Window.Mouse.ButtonUp += MouseButtonUp;
+			
 			Resize();
+			selectedWidget = widgets[1];
+			InputClick( 0, 0 );		
 		}
 		
 		public override void Resize() {