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

Bouncer OnTileEdit remove personal storage SSC check.

Browse source 
We are covering/tracking these features properly now in SSC, thus they are unnedded.
This commit is contained in:
Patrikkk 2020-06-12 10:38:13 +02:00
parent f5e1510f58
commit c03ac50f81
2 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -15,7 +15,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Adding staff projectiles to the directionalProjectiles Dictionary to include staffs in the valid projectile creation check. * Adding staff projectiles to the directionalProjectiles Dictionary to include staffs in the valid projectile creation check.
* 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)
* Prevent player placing the Void Vault and Defenders Forge if the server is in SSC mode.(@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)

16
TShockAPI/Bouncer.cs
View file

@ -365,14 +365,6 @@ namespace TShockAPI
args.Handled = true; args.Handled = true;
return; return;
} }
if (action == EditAction.PlaceTile && personalStorageTileIDs.Contains(editData) && 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())
@ -2135,14 +2127,6 @@ namespace TShockAPI
TileID.Campfire TileID.Campfire
}; };
private static List<int> personalStorageTileIDs = new List<int>()
{
TileID.PiggyBank,
TileID.Safes,
TileID.DefendersForge,
TileID.VoidVault
};
/// <summary> /// <summary>
/// These projectiles have been added or modified with Terraria 1.4. /// These projectiles have been added or modified with Terraria 1.4.
/// They come from normal items, but to have the directional functionality, they must be projectiles. /// They come from normal items, but to have the directional functionality, they must be projectiles.