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

Merge pull request #2044 from Pryaxis/addpersonalstoragecheck

Browse source 
Bouncer OnTileEdit - Remove person storage tile check for SSC
This commit is contained in:
Chris 2020-06-13 15:51:13 +09:30 • committed by GitHub
commit 12e2ef20f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -16,6 +16,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Adding GolfBallItemIDs list in Handlers.LandGolfBallInCupHandler.cs * Adding GolfBallItemIDs list in Handlers.LandGolfBallInCupHandler.cs
* Fixed an issue in the SendTileSquare handler that was rejecting valid tile objects (@QuiCM) * Fixed an issue in the SendTileSquare handler that was rejecting valid tile objects (@QuiCM)
* Fixed the issue where players were unable to place regular ropes because of the valid placement being caught in Bouncer OnTileEdit. (@Patrikkk) * Fixed the issue where players were unable to place regular ropes because of the valid placement being caught in Bouncer OnTileEdit. (@Patrikkk)
* Remove checks that prevented people placing personal storage tiles in SSC as the personal storage is synced with the server.(@Patrikkk)
## TShock 4.4.0 (Pre-release 11) ## TShock 4.4.0 (Pre-release 11)
* New permission `tshock.tp.pylon` to enable teleporting via Teleportation Pylons (@QuiCM) * New permission `tshock.tp.pylon` to enable teleporting via Teleportation Pylons (@QuiCM)

8
TShockAPI/Bouncer.cs
View file

@ -367,14 +367,6 @@ namespace TShockAPI
args.Handled = true; args.Handled = true;
return; return;
} }
if (action == EditAction.PlaceTile && (editData == TileID.PiggyBank || editData == TileID.Safes) && Main.ServerSideCharacter)
{
TShock.Log.ConsoleDebug("Bouncer / OnTileEdit rejected from (sscprotect) {0} {1} {2}", args.Player.Name, action, editData);
args.Player.SendErrorMessage("You cannot place this tile because server side characters are enabled.");
args.Player.SendTileSquare(tileX, tileY, 3);
args.Handled = true;
return;
}
if (action == EditAction.PlaceTile && (editData == TileID.Containers || editData == TileID.Containers2)) if (action == EditAction.PlaceTile && (editData == TileID.Containers || editData == TileID.Containers2))
{ {
if (TShock.Utils.HasWorldReachedMaxChests()) if (TShock.Utils.HasWorldReachedMaxChests())