From 263c0bc402414d5440e1b6153271c0ca86e15dad Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sun, 17 Dec 2017 12:25:23 -0700 Subject: [PATCH] Revert "Bouncer: Handle case where prefix < 1" This reverts commit 3f79a904daa43f13159502de05b6371f2f9c5192. If prefix is < 1 and we block this event, clients can no longer delete picked up items. This is what caused what Joshwoo reported. --- TShockAPI/Bouncer.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 4f4e6419..65d1865f 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -359,8 +359,10 @@ namespace TShockAPI return; } - //make sure the prefix is a legit value - if (prefix > PrefixID.Count || prefix < 1) + // make sure the prefix is a legit value + // Note: Not checking if prefix is less than 1 because if it is, this check + // will break item pickups on the client. + if (prefix > PrefixID.Count) { args.Player.SendData(PacketTypes.ItemDrop, "", id); args.Handled = true;