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

Moving the DisplayDollItemSync hook inside null check.

Browse source 
In crafted (hacked) packet sending, people could send the DisplayDollItemSync packet with an entity ID that is not actually a display doll. This would not happen in a normal scenario.
If they send the crafted packet, our hook would have been invoked and it would have contain a null TEDisplayDoll object since we tried to get the TileEntity object as a TEDisplayDoll object.
This commit is contained in:
Patrikkk 2020-06-21 15:03:08 +02:00
parent 10a9ee399a
commit 90dd61e668
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/GetDataHandlers.cs
View file

@ -3797,11 +3797,10 @@ namespace TShockAPI
if (oldItem.type == 0 && newItem.type == 0) if (oldItem.type == 0 && newItem.type == 0)
return false; return false;
if (OnDisplayDollItemSync(args.Player, args.Data, playerIndex, tileEntityID, displayDoll, slot, isDye, oldItem, newItem))
return true;
} }
if (OnDisplayDollItemSync(args.Player, args.Data, playerIndex, tileEntityID, displayDoll, slot, isDye, oldItem, newItem))
return true;
return false; return false;
} }