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

Merge pull request #1654 from Pryaxis/fix-1653

Browse source 
Solves #1653
This commit is contained in:
Chris 2019-03-30 13:57:59 +10:30 • committed by GitHub
commit b50cac1d2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -94,6 +94,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Add NPCAddBuff data handler and bouncer (@AxeelAnder) * Add NPCAddBuff data handler and bouncer (@AxeelAnder)
* Improved config file documentation (@Enerdy) * Improved config file documentation (@Enerdy)
* Add PlayerZone data handler and bouncer (@AxeelAnder) * Add PlayerZone data handler and bouncer (@AxeelAnder)
* Fix banned armour checks not clearing properly (thanks @tysonstrange)
## TShock 4.3.25 ## 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. * 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.

2
TShockAPI/TShock.cs
View file

@ -1130,6 +1130,8 @@ namespace TShockAPI
} }
if (check != "none") if (check != "none")
player.IsDisabledForBannedWearable = true; player.IsDisabledForBannedWearable = true;
else
player.IsDisabledForBannedWearable = false;
if (player.IsBeingDisabled()) if (player.IsBeingDisabled())
{ {