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

Make gem locks work properly. Closes #2140 and #2036

Browse source
This commit is contained in:
Chris 2020-11-13 19:04:53 +10:30
parent db10bf22e7
commit 4802ebed91
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -17,6 +17,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Added Torch God's Favor support in SSC. (@Stealownz) * Added Torch God's Favor support in SSC. (@Stealownz)
* SendTileSquare is now SendTileRect and can now send rectangles instead of squares. This is a breaking change (@QuiCM) * SendTileSquare is now SendTileRect and can now send rectangles instead of squares. This is a breaking change (@QuiCM)
* Destroying protected tiles underneath a tile object no longer causes the tile object to disappear for the client (@QuiCM) * Destroying protected tiles underneath a tile object no longer causes the tile object to disappear for the client (@QuiCM)
* 'RegionProtectGemLocks' config option now works correctly. Gems can now be placed in Gem Locks while this option is enabled (@QuiCM)
## TShock 4.4.0 (Pre-release 13) ## TShock 4.4.0 (Pre-release 13)
* Terraria v1.4.1.1 * Terraria v1.4.1.1

3
TShockAPI/RegionHandler.cs
View file

@ -56,10 +56,13 @@ namespace TShockAPI
private void OnGemLockToggle(object sender, GetDataHandlers.GemLockToggleEventArgs e) private void OnGemLockToggle(object sender, GetDataHandlers.GemLockToggleEventArgs e)
{ {
if (TShock.Config.RegionProtectGemLocks) if (TShock.Config.RegionProtectGemLocks)
{
if (!_regionManager.CanBuild(e.X, e.Y, e.Player))
{ {
e.Handled = true; e.Handled = true;
} }
} }
}
private void OnPlayerUpdate(object sender, GetDataHandlers.PlayerUpdateEventArgs e) private void OnPlayerUpdate(object sender, GetDataHandlers.PlayerUpdateEventArgs e)
{ {