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

Tentative update to 1.2.3

Browse source
This commit is contained in:
MarioE 2014-02-13 21:01:06 -05:00
parent 4ef324e026
commit 29f59b4f86
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/GetDataHandlers.cs
View file

@ -79,7 +79,7 @@ namespace TShockAPI
/// <summary> /// <summary>
/// The Tile ID being edited. /// The Tile ID being edited.
/// </summary> /// </summary>
public byte EditData { get; set; } public ushort EditData { get; set; }
/// <summary> /// <summary>
/// The EditType. /// The EditType.
/// (KillTile = 0, PlaceTile = 1, KillWall = 2, PlaceWall = 3, KillTileNoItem = 4, PlaceWire = 5, KillWire = 6) /// (KillTile = 0, PlaceTile = 1, KillWall = 2, PlaceWall = 3, KillTileNoItem = 4, PlaceWire = 5, KillWire = 6)
@ -101,7 +101,7 @@ namespace TShockAPI
/// TileEdit - called when a tile is placed or destroyed /// TileEdit - called when a tile is placed or destroyed
/// </summary> /// </summary>
public static HandlerList<TileEditEventArgs> TileEdit; public static HandlerList<TileEditEventArgs> TileEdit;
private static bool OnTileEdit(TSPlayer ply, int x, int y, EditAction action, EditType editDetail, byte editData, byte style) private static bool OnTileEdit(TSPlayer ply, int x, int y, EditAction action, EditType editDetail, ushort editData, byte style)
{ {
if (TileEdit == null) if (TileEdit == null)
return false; return false;
@ -1600,7 +1600,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 byte[] orientableTiles = new byte[] { 15, 79, 90, 105, 128, 137, 139, 171, 207, 209 }; private static int[] orientableTiles = new int[] { 15, 79, 90, 105, 128, 137, 139, 171, 207, 209 };
private static bool HandleSendTileSquare(GetDataHandlerArgs args) private static bool HandleSendTileSquare(GetDataHandlerArgs args)
{ {
@ -1756,7 +1756,7 @@ namespace TShockAPI
/// <summary> /// <summary>
/// Tiles that can be broken without any tools. /// Tiles that can be broken without any tools.
/// </summary> /// </summary>
private static byte[] breakableTiles = new byte[] { 4, 13, 33, 49, 50, 127, 128, 162 }; private static int[] breakableTiles = new int[] { 4, 13, 33, 49, 50, 127, 128, 162 };
/// <summary> /// <summary>
/// The maximum place styles for each tile. /// The maximum place styles for each tile.
/// </summary> /// </summary>
@ -1774,7 +1774,7 @@ namespace TShockAPI
try try
{ {
var editData = args.Data.ReadInt8(); var editData = args.Data.ReadUInt16();
EditType type = (action == EditAction.KillTile || action == EditAction.KillWall || EditType type = (action == EditAction.KillTile || action == EditAction.KillWall ||
action == EditAction.KillTileNoItem) action == EditAction.KillTileNoItem)
? EditType.Fail ? EditType.Fail

4
TShockAPI/SaveManager.cs
View file

@ -125,10 +125,10 @@ namespace TShockAPI
if (task.direct) if (task.direct)
{ {
OnSaveWorld(new WorldSaveEventArgs()); OnSaveWorld(new WorldSaveEventArgs());
WorldGen.realsaveWorld(task.resetTime); WorldFile.realsaveWorld(task.resetTime);
} }
else else
WorldGen.saveWorld(task.resetTime); WorldFile.saveWorld(task.resetTime);
TShock.Utils.Broadcast("World saved.", Color.Yellow); TShock.Utils.Broadcast("World saved.", Color.Yellow);
Log.Info(string.Format("World saved at ({0})", Main.worldPathName)); Log.Info(string.Format("World saved at ({0})", Main.worldPathName));
} }

2
TShockAPI/TShock.cs
View file

@ -1548,7 +1548,7 @@ namespace TShockAPI
return false; return false;
} }
public static bool CheckTilePermission(TSPlayer player, int tileX, int tileY, byte tileType, GetDataHandlers.EditAction actionType) public static bool CheckTilePermission(TSPlayer player, int tileX, int tileY, ushort tileType, GetDataHandlers.EditAction actionType)
{ {
if (!player.Group.HasPermission(Permissions.canbuild)) if (!player.Group.HasPermission(Permissions.canbuild))
{ {

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit 0ddd492aa03e5c97dddbc95b2e605fa2823804ab Subproject commit 69061acd612172ae6f3aa1d5d9f9e50174e350d3