themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #755 from CoderCow/patch-1

Browse source 
Fixed PlayerInfo Packet Handling
This commit is contained in:
MarioE 2014-02-18 16:54:16 -05:00
commit 2e8398d4a2
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/GetDataHandlers.cs
View file

@ -1379,7 +1379,15 @@ namespace TShockAPI
var playerid = args.Data.ReadInt8(); var playerid = args.Data.ReadInt8();
var hair = args.Data.ReadInt8(); var hair = args.Data.ReadInt8();
var male = args.Data.ReadBoolean(); 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(); var difficulty = args.Data.ReadInt8();
string name = Encoding.UTF8.GetString(args.Data.ReadBytes((int) (args.Data.Length - args.Data.Position - 1))); string name = Encoding.UTF8.GetString(args.Data.ReadBytes((int) (args.Data.Length - args.Data.Position - 1)));
@ -1396,6 +1404,14 @@ namespace TShockAPI
} }
if (args.Player.ReceivedInfo) 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; return true;
} }
if (TShock.Config.MediumcoreOnly && difficulty < 1) if (TShock.Config.MediumcoreOnly && difficulty < 1)