Merge pull request #755 from CoderCow/patch-1

Fixed PlayerInfo Packet Handling
Pryaxis · Feb 18, 2014 · 2e8398d · 2e8398d
2 parents ecc6139 + 9b07eca
commit 2e8398d
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
@@ -1379,7 +1379,15 @@ private static bool HandlePlayerInfo(GetDataHandlerArgs args)
 			var playerid = args.Data.ReadInt8();
 			var hair = args.Data.ReadInt8();
 			var male = args.Data.ReadBoolean();
-			args.Data.Position += 21;
+			byte hairDye = args.Data.ReadInt8();
+			BitsByte hideVisual = args.Data.ReadInt8();
+			Color hairColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
+			Color skinColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
+			Color eyeColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
+			Color shirtColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
+			Color underShirtColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
+			Color pantsColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
+			Color shoeColor = new Color(args.Data.ReadInt8(), args.Data.ReadInt8(), args.Data.ReadInt8());
 			var difficulty = args.Data.ReadInt8();
 			string name = Encoding.UTF8.GetString(args.Data.ReadBytes((int) (args.Data.Length - args.Data.Position - 1)));
 
@@ -1396,6 +1404,14 @@ private static bool HandlePlayerInfo(GetDataHandlerArgs args)
 			}
 			if (args.Player.ReceivedInfo)
 			{
+				// Since Terraria 1.2.3 these character properties can change ingame.
+				args.Player.TPlayer.hairColor = hairColor;
+				args.Player.TPlayer.hairDye = hairDye;
+				args.Player.TPlayer.pantsColor = pantsColor;
+				args.Player.TPlayer.shirtColor = shirtColor;
+				args.Player.TPlayer.underShirtColor = underShirtColor;
+				args.Player.TPlayer.shoeColor = shoeColor;
+				args.Player.TPlayer.hideVisual = hideVisual;
 				return true;
 			}
 			if (TShock.Config.MediumcoreOnly && difficulty < 1)