diff --git a/TShockAPI/Handlers/SendTileRectHandler.cs b/TShockAPI/Handlers/SendTileRectHandler.cs
index e5e3f360..d66c3ef6 100644
--- a/TShockAPI/Handlers/SendTileRectHandler.cs
+++ b/TShockAPI/Handlers/SendTileRectHandler.cs
@@ -78,6 +78,13 @@ namespace TShockAPI.Handlers
Removal,
}
+ public enum MatchResult
+ {
+ NotMatched,
+ RejectChanges,
+ BroadcastChanges,
+ }
+
private readonly int Width;
private readonly int Height;
@@ -179,11 +186,11 @@ namespace TShockAPI.Handlers
/// The player the operation originates from.
/// The tile rectangle of the operation.
/// , if the rect matches this operation and the changes have been applied, otherwise .
- public bool Matches(TSPlayer player, TileRect rect)
+ public MatchResult Matches(TSPlayer player, TileRect rect)
{
if (rect.Width != Width || rect.Height != Height)
{
- return false;
+ return MatchResult.NotMatched;
}
for (int x = 0; x < rect.Width; x++)
@@ -195,7 +202,7 @@ namespace TShockAPI.Handlers
{
if (tile.Type != TileType)
{
- return false;
+ return MatchResult.NotMatched;
}
}
if (Type is MatchType.Placement or MatchType.StateChange)
@@ -204,7 +211,7 @@ namespace TShockAPI.Handlers
{
if (tile.FrameX < 0 || tile.FrameX > MaxFrameX || tile.FrameX % FrameXStep != 0)
{
- return false;
+ return MatchResult.NotMatched;
}
}
if (MaxFrameY != IGNORE_FRAME)
@@ -214,7 +221,7 @@ namespace TShockAPI.Handlers
// this is the only tile type sent in a tile rect where the frame have a different pattern (56, 74, 92 instead of 54, 72, 90)
if (!(TileType == TileID.LunarMonolith && tile.FrameY % FrameYStep == 2))
{
- return false;
+ return MatchResult.NotMatched;
}
}
}
@@ -223,7 +230,7 @@ namespace TShockAPI.Handlers
{
if (tile.Active)
{
- return false;
+ return MatchResult.NotMatched;
}
}
}
@@ -236,7 +243,7 @@ namespace TShockAPI.Handlers
if (!player.HasBuildPermission(x, y))
{
// for simplicity, let's pretend that the edit was valid, but do not execute it
- return true;
+ return MatchResult.RejectChanges;
}
}
}
@@ -257,10 +264,10 @@ namespace TShockAPI.Handlers
}
}
- return false;
+ return MatchResult.NotMatched;
}
- private bool MatchPlacement(TSPlayer player, TileRect rect)
+ private MatchResult MatchPlacement(TSPlayer player, TileRect rect)
{
for (int x = rect.X; x < rect.Y + rect.Width; x++)
{
@@ -268,7 +275,7 @@ namespace TShockAPI.Handlers
{
if (Main.tile[x, y].active()) // the client will kill tiles that auto break before placing the object
{
- return false;
+ return MatchResult.NotMatched;
}
}
}
@@ -277,7 +284,7 @@ namespace TShockAPI.Handlers
if (TShock.TileBans.TileIsBanned((short)TileType, player))
{
// for simplicity, let's pretend that the edit was valid, but do not execute it
- return true;
+ return MatchResult.RejectChanges;
}
for (int x = 0; x < rect.Width; x++)
@@ -291,10 +298,10 @@ namespace TShockAPI.Handlers
}
}
- return true;
+ return MatchResult.BroadcastChanges;
}
- private bool MatchStateChange(TSPlayer player, TileRect rect)
+ private MatchResult MatchStateChange(TSPlayer player, TileRect rect)
{
for (int x = rect.X; x < rect.Y + rect.Width; x++)
{
@@ -302,7 +309,7 @@ namespace TShockAPI.Handlers
{
if (!Main.tile[x, y].active() || Main.tile[x, y].type != TileType)
{
- return false;
+ return MatchResult.NotMatched;
}
}
}
@@ -322,10 +329,10 @@ namespace TShockAPI.Handlers
}
}
- return true;
+ return MatchResult.BroadcastChanges;
}
- private bool MatchRemoval(TSPlayer player, TileRect rect)
+ private MatchResult MatchRemoval(TSPlayer player, TileRect rect)
{
for (int x = rect.X; x < rect.X + rect.Width; x++)
{
@@ -333,7 +340,7 @@ namespace TShockAPI.Handlers
{
if (!Main.tile[x, y].active() || Main.tile[x, y].type != TileType)
{
- return false;
+ return MatchResult.NotMatched;
}
}
}
@@ -348,7 +355,7 @@ namespace TShockAPI.Handlers
}
}
- return true;
+ return MatchResult.BroadcastChanges;
}
}
@@ -364,7 +371,7 @@ namespace TShockAPI.Handlers
TileRectMatch.Placement(2, 3, TileID.TargetDummy, 54, 36, 18, 18),
TileRectMatch.Placement(3, 4, TileID.TeleportationPylon, 468, 54, 18, 18),
TileRectMatch.Placement(2, 3, TileID.DisplayDoll, 126, 36, 18, 18),
- TileRectMatch.Placement(2, 3, TileID.HatRack, 90, 54, 18, 18),
+ TileRectMatch.Placement(3, 4, TileID.HatRack, 90, 54, 18, 18),
TileRectMatch.Placement(2, 2, TileID.ItemFrame, 162, 18, 18, 18),
TileRectMatch.Placement(3, 3, TileID.WeaponsRack2, 90, 36, 18, 18),
TileRectMatch.Placement(1, 1, TileID.FoodPlatter, 18, 0, 18, 18),
@@ -436,7 +443,7 @@ namespace TShockAPI.Handlers
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect rejected from throttle from {args.Player.Name}"));
// send correcting data
- args.Player.SendTileRect(args.TileX, args.TileY, args.Length, args.Width);
+ args.Player.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
return;
}
@@ -446,7 +453,7 @@ namespace TShockAPI.Handlers
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect rejected from being disabled from {args.Player.Name}"));
// send correcting data
- args.Player.SendTileRect(args.TileX, args.TileY, args.Length, args.Width);
+ args.Player.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
return;
}
@@ -468,7 +475,7 @@ namespace TShockAPI.Handlers
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect reimplemented from {args.Player.Name}"));
// send correcting data
- args.Player.SendTileRect(args.TileX, args.TileY, args.Length, args.Width);
+ args.Player.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
return;
}
@@ -478,7 +485,7 @@ namespace TShockAPI.Handlers
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect rejected from out of range from {args.Player.Name}"));
// send correcting data
- args.Player.SendTileRect(args.TileX, args.TileY, args.Length, args.Width);
+ args.Player.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
return;
}
@@ -488,19 +495,23 @@ namespace TShockAPI.Handlers
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect reimplemented from {args.Player.Name}"));
// send correcting data
- args.Player.SendTileRect(args.TileX, args.TileY, args.Length, args.Width);
+ args.Player.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
return;
}
// check if the rect matches any valid operation
foreach (TileRectMatch match in Matches)
{
- if (match.Matches(args.Player, rect))
+ var result = match.Matches(args.Player, rect);
+ if (result != TileRectMatch.MatchResult.NotMatched)
{
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect reimplemented from {args.Player.Name}"));
// send correcting data
- args.Player.SendTileRect(args.TileX, args.TileY, args.Length, args.Width);
+ if (result == TileRectMatch.MatchResult.RejectChanges)
+ args.Player.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
+ if (result == TileRectMatch.MatchResult.BroadcastChanges)
+ TSPlayer.All.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
return;
}
}
@@ -511,14 +522,14 @@ namespace TShockAPI.Handlers
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect reimplemented from {args.Player.Name}"));
// send correcting data
- args.Player.SendTileRect(args.TileX, args.TileY, args.Length, args.Width);
+ args.Player.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
return;
}
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect rejected from matches from {args.Player.Name}"));
// send correcting data
- args.Player.SendTileRect(args.TileX, args.TileY, args.Length, args.Width);
+ args.Player.SendTileRect(args.TileX, args.TileY, args.Width, args.Length);
return;
}