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

Merge pull request #1994 from Pryaxis/playerinfodata

Browse source 
GetDataHandler - Add missing PlayerInfo data.
This commit is contained in:
Chris 2020-06-05 12:08:14 +09:30 • committed by GitHub
commit 6f65107b1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -12,6 +12,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Add SyncTilePicking event. This is called when a player damages a tile. Implementing SyncTilePickingHandler and patching tile damaging related exploits. (Preventing player sending invalid world position data which disconnects other players.) * Add SyncTilePicking event. This is called when a player damages a tile. Implementing SyncTilePickingHandler and patching tile damaging related exploits. (Preventing player sending invalid world position data which disconnects other players.)
* Fix the issue where mobs could not be fished out during bloodmoon because of Bouncer checks. (@Patrikkk) * Fix the issue where mobs could not be fished out during bloodmoon because of Bouncer checks. (@Patrikkk)
* Update for OTAPI 2.0.0.37 and Terraria 1.4.0.5. (@hakusaro, @Patrikkk) * Update for OTAPI 2.0.0.37 and Terraria 1.4.0.5. (@hakusaro, @Patrikkk)
* Adding missing PlayerInfo data in GetDataHandler. (@Patrikkk)
## TShock 4.4.0 (Pre-release 10) ## TShock 4.4.0 (Pre-release 10)
* Fix all rope coils. (@Olink) * Fix all rope coils. (@Olink)

12
TShockAPI/GetDataHandlers.cs
View file

@ -2142,14 +2142,20 @@ namespace TShockAPI
byte difficulty = 0; byte difficulty = 0;
if (extra[0]) if (extra[0])
{ {
difficulty++; difficulty = 1;
} }
else if (extra[1]) else if (extra[1])
{ {
difficulty += 2; difficulty = 2;
}
else if (extra[3])
{
difficulty = 3;
} }
bool extraSlot = extra[2]; bool extraSlot = extra[2];
BitsByte torchFlags = args.Data.ReadInt8();
bool usingBiomeTorches = torchFlags[0];
bool happyFunTorchTime = torchFlags[1];
if (OnPlayerInfo(args.Player, args.Data, playerid, hair, skinVariant, difficulty, name)) if (OnPlayerInfo(args.Player, args.Data, playerid, hair, skinVariant, difficulty, name))
{ {