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

Added check to HandleNpcTalk to ensure the passed NPC index is within

Browse source 
bounds (>= -1 && < `Main.maxNPCs`).
This commit is contained in:
James Puleo 2021-12-02 09:37:17 -05:00
parent ce056f1ce5
commit 97f33fea63
No known key found for this signature in database
GPG key ID: 3E16C7EFA34FB15D
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -16,6 +16,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Fixed the ability to spawn Zenith projectile with non-original items. (@AgaSpace) * Fixed the ability to spawn Zenith projectile with non-original items. (@AgaSpace)
* Added hook `GetDataHandlers.OnNpcTalk` for NpcTalk and a handler for it that stops unregistered and logged out players from interacting with NPCs, preventing them from smuggling or duplicating items via NPC item slots. (@tru321) * Added hook `GetDataHandlers.OnNpcTalk` for NpcTalk and a handler for it that stops unregistered and logged out players from interacting with NPCs, preventing them from smuggling or duplicating items via NPC item slots. (@tru321)
* Fixed the ability to create custom messages with your death (or the death of another player) (@AgaSpace) * Fixed the ability to create custom messages with your death (or the death of another player) (@AgaSpace)
* Added check to `HandleNpcTalk` to ensure the passed NPC index is within bounds (>= -1 && < `Main.maxNPCs`). (@drunderscore)
## TShock 4.5.11 ## TShock 4.5.11
* Add the new allowed buff TentacleSpike to NPC buff cheat detection bouncer. (@sgkoishi) * Add the new allowed buff TentacleSpike to NPC buff cheat detection bouncer. (@sgkoishi)

11
TShockAPI/GetDataHandlers.cs
View file

@ -3160,9 +3160,16 @@ namespace TShockAPI
TShock.Log.ConsoleDebug("Bouncer / HandleNpcTalk rejected from bouncer throttle from {0}", args.Player.Name); TShock.Log.ConsoleDebug("Bouncer / HandleNpcTalk rejected from bouncer throttle from {0}", args.Player.Name);
return true; return true;
} }
// -1 is a magic value, represents not talking to an NPC
if (npc < -1 || npc >= Main.maxNPCs)
{
TShock.Log.ConsoleDebug("Bouncer / HandleNpcTalk rejected from bouncer out of bounds from {0}", args.Player.Name);
return true;
}
return false; return false;
} }
private static bool HandlePlayerAnimation(GetDataHandlerArgs args) private static bool HandlePlayerAnimation(GetDataHandlerArgs args)
{ {
if (OnPlayerAnimation(args.Player, args.Data)) if (OnPlayerAnimation(args.Player, args.Data))