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

Fixed Tall Gates and Trap Doors. Solves #998

Browse source
This commit is contained in:
White 2015-07-16 17:22:37 +09:30
parent 9d55122da8
commit a577dbbcc4
1 changed files with 63 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

74
TShockAPI/GetDataHandlers.cs
View file

@ -1614,19 +1614,55 @@ namespace TShockAPI
} }
/// <summary> /// <summary>
/// Tiles that can be oriented (e.g., beds, chairs, bathtubs, etc). /// Tile IDs that can be oriented:
/// Cannon,
/// Chairs,
/// Beds,
/// Bathtubs,
/// Statues,
/// Mannequin,
/// Traps,
/// MusicBoxes,
/// ChristmasTree,
/// WaterFountain,
/// Womannequin,
/// MinecartTrack,
/// WeaponsRack
/// </summary> /// </summary>
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 int[] orientableTiles = new int[]
{
TileID.Cannon,
TileID.Chairs,
TileID.Beds,
TileID.Bathtubs,
TileID.Statues,
TileID.Mannequin,
TileID.Traps,
TileID.MusicBoxes,
TileID.ChristmasTree,
TileID.WaterFountain,
TileID.Womannequin,
TileID.MinecartTrack,
TileID.WeaponsRack
};
private static bool HandleSendTileSquare(GetDataHandlerArgs args) private static bool HandleSendTileSquare(GetDataHandlerArgs args)
{ {
if (args.Player.Group.HasPermission(Permissions.allowclientsideworldedit))
return false;
var size = args.Data.ReadInt16(); var size = args.Data.ReadInt16();
var tileX = args.Data.ReadInt16(); var tileX = args.Data.ReadInt16();
var tileY = args.Data.ReadInt16(); var tileY = args.Data.ReadInt16();
bool isTrapdoor = false;
if (Main.tile[tileX, tileY].type == TileID.TrapdoorClosed
|| Main.tile[tileX, tileY].type == TileID.TrapdoorOpen)
{
isTrapdoor = true;
}
if (args.Player.Group.HasPermission(Permissions.allowclientsideworldedit) && !isTrapdoor)
return false;
if (OnSendTileSquare(size, tileX, tileY)) if (OnSendTileSquare(size, tileX, tileY))
return true; return true;
@ -1806,7 +1842,10 @@ namespace TShockAPI
/// <summary> /// <summary>
/// Extra place style limits for strange hardcoded values in Terraria /// Extra place style limits for strange hardcoded values in Terraria
/// </summary> /// </summary>
private static Dictionary<int, int> ExtraneousPlaceStyles = new Dictionary<int, int>{{TileID.MinecartTrack, 3}}; private static Dictionary<int, int> ExtraneousPlaceStyles = new Dictionary<int, int>
{
{TileID.MinecartTrack, 3}
};
private static bool HandleTile(GetDataHandlerArgs args) private static bool HandleTile(GetDataHandlerArgs args)
{ {
@ -3628,16 +3667,29 @@ namespace TShockAPI
private static bool HandleDoorUse(GetDataHandlerArgs args) private static bool HandleDoorUse(GetDataHandlerArgs args)
{ {
args.Data.ReadByte(); // Ignore close byte type = (byte)args.Data.ReadByte();
var x = args.Data.ReadInt16(); short x = args.Data.ReadInt16();
var y = args.Data.ReadInt16(); short y = args.Data.ReadInt16();
/* var dir = */ args.Data.ReadByte(); //== 0 ? -1 : 1; // Ignore direction args.Data.ReadByte(); //Ignore direction
if (x >= Main.maxTilesX || y >= Main.maxTilesY || x < 0 || y < 0) // Check for out of range if (x >= Main.maxTilesX || y >= Main.maxTilesY || x < 0 || y < 0) // Check for out of range
{
return true; return true;
}
if (Main.tile[x, y].type != 10 && Main.tile[x, y].type != 11) // Check for tile types if (type < 0 || type > 5)
{
return true; return true;
}
ushort tileType = Main.tile[x, y].type;
if (tileType != TileID.ClosedDoor && tileType != TileID.OpenDoor
&& tileType != TileID.TallGateClosed && tileType != TileID.TallGateOpen
&& tileType != TileID.TrapdoorClosed && tileType != TileID.TrapdoorOpen)
{
return true;
}
return false; return false;
} }