Merge pull request #3064 from LaoSparrow/handle-msg-24

fix(GetDataHandlers): handle and ignore `NpcItemStrike(msgid 24)`
Pryaxis · Mar 1, 2025 · c9cbee1 · c9cbee1
2 parents 8d186bb + 740c5c9
commit c9cbee1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
@@ -95,6 +95,7 @@ public static void InitGetDataHandler()
 					{ PacketTypes.TileSendSquare, HandleSendTileRect },
 					{ PacketTypes.ItemDrop, HandleItemDrop },
 					{ PacketTypes.ItemOwner, HandleItemOwner },
+					{ PacketTypes.NpcItemStrike, HandleNpcItemStrike },
 					{ PacketTypes.ProjectileNew, HandleProjectileNew },
 					{ PacketTypes.NpcStrike, HandleNpcStrike },
 					{ PacketTypes.ProjectileDestroy, HandleProjectileKill },
@@ -2945,6 +2946,13 @@ private static bool HandleItemOwner(GetDataHandlerArgs args)
 			return false;
 		}
 
+		private static bool HandleNpcItemStrike(GetDataHandlerArgs args)
+		{
+			// Never sent by vanilla client, ignore this
+			TShock.Log.ConsoleDebug(GetString("GetDataHandlers / HandleNpcItemStrike surprise packet! Someone tell the TShock team! {0}", args.Player.Name));
+			return true;
+		}
+
 		private static bool HandleProjectileNew(GetDataHandlerArgs args)
 		{
 			short ident = args.Data.ReadInt16();

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -99,6 +99,7 @@ Use past tense when adding new entries; sign your name off when you add or chang
   * Fixed incorrect validating range in `TileRectMatch.MatchRemoval`.
   * Fixed tile rect changes (e.g. turning on and off campfires) are not synced between clients.
   * Fixed unable to place Hat Rack without permission `tshock.ignore.sendtilesquare`.
+* Updated `GetDataHandlers` to ignore `NpcItemStrike(msgid 24)`, which should never be sent by a vanilla client. (@LaoSparrow)
 
 ## TShock 5.2.1
 * Updated `TSPlayer.GodMode`. (@AgaSpace)