diff --git a/CHANGELOG.md b/CHANGELOG.md index a9124289..9940a361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large. ## Upcoming Changes +* Added confused debuff to Bouncer for confusion applied from Brain of Confusion * API: Added return in OnNameCollision if hook has been handled. (@Patrikkk) * API: Added hooks for item, projectile and tile bans (@deadsurgeon42) * API: Changed `PlayerHooks` permission hook mechanisms to allow negation from hooks (@deadsurgeon42) @@ -94,6 +95,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Add NPCAddBuff data handler and bouncer (@AxeelAnder) * Improved config file documentation (@Enerdy) * Add PlayerZone data handler and bouncer (@AxeelAnder) +* Fix banned armour checks not clearing properly (thanks @tysonstrange) ## TShock 4.3.25 * Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6. diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 92d62ec9..a3c5f6b8 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -1869,7 +1869,9 @@ namespace TShockAPI { BuffID.DryadsWardDebuff, 120 }, { BuffID.Daybreak, 300 }, { BuffID.BetsysCurse, 600 }, - { BuffID.Oiled, 540 } + { BuffID.Oiled, 540 }, + { BuffID.Confused, 360 }, // Brain of Confusion Internal Item ID: 3223 + { BuffID.Daybreak, 300 } // Solar Eruption Item ID: 3473, Daybreak Item ID: 3543 }; /// diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index f1b6b97c..bf662d38 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -1130,6 +1130,8 @@ namespace TShockAPI } if (check != "none") player.IsDisabledForBannedWearable = true; + else + player.IsDisabledForBannedWearable = false; if (player.IsBeingDisabled()) {