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

Fix ice rod tiles not being broken and fix various sendtilesquare-related tile bugs

Browse source
This commit is contained in:
MarioE 2014-06-20 11:31:36 -04:00
parent e50f2dfd1e
commit f4bce20d50
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
TShockAPI/GetDataHandlers.cs
View file

@ -1616,7 +1616,7 @@ namespace TShockAPI
/// <summary> /// <summary>
/// Tiles that can be oriented (e.g., beds, chairs, bathtubs, etc). /// Tiles that can be oriented (e.g., beds, chairs, bathtubs, etc).
/// </summary> /// </summary>
private static int[] orientableTiles = new int[] { 15, 79, 90, 105, TileID.Mannequin, 137, 139, 171, 207, 209, 314, TileID.Womannequin, TileID.MinecartTrack, TileID.WeaponsRack }; private static int[] orientableTiles = new int[] { TileID.Cannon, 15, 79, 90, 105, TileID.Mannequin, 137, 139, 171, 207, 314, TileID.Womannequin, TileID.MinecartTrack, TileID.WeaponsRack };
private static bool HandleSendTileSquare(GetDataHandlerArgs args) private static bool HandleSendTileSquare(GetDataHandlerArgs args)
{ {
@ -1684,9 +1684,8 @@ namespace TShockAPI
Main.tile[realx, realy].frameY = newtile.FrameY; Main.tile[realx, realy].frameY = newtile.FrameY;
changed = true; changed = true;
} }
// Landmine // Landmine
if (tile.type == 210 && !newtile.Active) if (tile.type == TileID.LandMine && !newtile.Active)
{ {
Main.tile[realx, realy].active(false); Main.tile[realx, realy].active(false);
changed = true; changed = true;
@ -1729,7 +1728,7 @@ namespace TShockAPI
if (changed) if (changed)
{ {
TSPlayer.All.SendTileSquare(tileX, tileY, size); TSPlayer.All.SendTileSquare(tileX, tileY, size + 1);
WorldGen.RangeFrame(tileX, tileY, tileX + size, tileY + size); WorldGen.RangeFrame(tileX, tileY, tileX + size, tileY + size);
} }
else else
@ -1806,7 +1805,11 @@ namespace TShockAPI
if (OnTileEdit(args.Player, tileX, tileY, action, type, editData, style)) if (OnTileEdit(args.Player, tileX, tileY, action, type, editData, style))
return true; return true;
if (!TShock.Utils.TilePlacementValid(tileX, tileY) || (args.Player.Dead && TShock.Config.PreventDeadModification)) if (!TShock.Utils.TilePlacementValid(tileX, tileY))
return true;
if (action == EditAction.KillTile && Main.tile[tileX, tileY].type == TileID.MagicalIceBlock)
return false;
if (args.Player.Dead && TShock.Config.PreventDeadModification)
return true; return true;
if (args.Player.AwaitingName) if (args.Player.AwaitingName)
@ -2006,14 +2009,8 @@ namespace TShockAPI
return true; return true;
} }
// Ignore ice rod break
if ((editData == 127 || Main.tileCut[editData]) && (action == EditAction.KillTile || action == EditAction.KillTileNoItem))
{
return false;
}
// Ignore rope placement range // Ignore rope placement range
if ((editData != 213 || action != EditAction.PlaceTile) && TShock.CheckRangePermission(args.Player, tileX, tileY)) if ((editData != TileID.Rope || action != EditAction.PlaceTile) && TShock.CheckRangePermission(args.Player, tileX, tileY))
{ {
args.Player.SendTileSquare(tileX, tileY, 4); args.Player.SendTileSquare(tileX, tileY, 4);
return true; return true;