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

Merge branch 'general-devel' into player-data

Browse source
This commit is contained in:
Chris 2019-03-30 13:58:19 +10:30 • committed by GitHub
commit 9b75342bff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -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. 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 ## 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 return in OnNameCollision if hook has been handled. (@Patrikkk)
* API: Added hooks for item, projectile and tile bans (@deadsurgeon42) * API: Added hooks for item, projectile and tile bans (@deadsurgeon42)
* API: Changed `PlayerHooks` permission hook mechanisms to allow negation from hooks (@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) * 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.

4
TShockAPI/Bouncer.cs
View file

@ -1869,7 +1869,9 @@ namespace TShockAPI
{ BuffID.DryadsWardDebuff, 120 }, { BuffID.DryadsWardDebuff, 120 },
{ BuffID.Daybreak, 300 }, { BuffID.Daybreak, 300 },
{ BuffID.BetsysCurse, 600 }, { 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
}; };
/// <summary> /// <summary>

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())
{ {