Skip to content

Commit

Permalink
更新v4.3.19 (汉化v1.4) - API v1.25
Browse files Browse the repository at this point in the history
  • Loading branch information
mistzzt committed Oct 8, 2016
2 parents b6c88b3 + f8039c8 commit fcab6a9
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 15 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin

## Upcoming Changes

## TShock 4.3.19
* Compatibility with Terraria 1.3.3.3 (@Simon311)
* API: Version tick 1.25
* API: Resolved some issues with the ItemForceIntoChest hook (@WhiteXZ, @Patrikkk)
* API: Resolved some shonky code that caused Vitamins and other Ankh Shield related items to drop at strange rates or not at all (@ProfessorXZ, @WhiteXZ, @nicatronTg)
* Fixed magical ice blocks not working correctly (@ProfessorXZ)

## TShock 4.3.18

* Compatibility with Terraria 1.3.3.2
* API: Version tick 1.2.4
* API: Version tick 1.24
* API: Fixed chat line breaks when using chat tags and long strings of text (@ProfessorXZ)
* API: Added ItemForceIntoChest hook (@WhiteXZ)
* API: Included the player's registration date in REST's players/read endpoints (@ProfessorXZ)
Expand Down
8 changes: 2 additions & 6 deletions TShockAPI/GetDataHandlers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2055,13 +2055,9 @@ private static bool HandleTile(GetDataHandlerArgs args)
}

// If they aren't selecting the item which creates the tile or wall, they're hacking.
if (editData != (action == EditAction.PlaceTile ? selectedItem.createTile : selectedItem.createWall))
if (!(selectedItem.netID == ItemID.IceRod && editData == TileID.MagicalIceBlock) &&
editData != (action == EditAction.PlaceTile ? selectedItem.createTile : selectedItem.createWall))
{
if (selectedItem.netID == ItemID.IceRod && editData == TileID.MagicalIceBlock)
{
return false;
}

args.Player.SendTileSquare(tileX, tileY, 4);
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions TShockAPI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ You should have received a copy of the GNU General Public License
// Also, be sure to release on github with the exact assembly version tag as below
// so that the update manager works correctly (via the Github releases api and mimic)

[assembly: AssemblyVersion("4.3.18")]
[assembly: AssemblyFileVersion("4.3.18")]
[assembly: AssemblyVersion("4.3.19")]
[assembly: AssemblyFileVersion("4.3.19")]
2 changes: 1 addition & 1 deletion TShockAPI/Rest/RestManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ private object GroupCreate(RestRequestArgs args)
[Noun("group", true, "The name of the group to modify.", typeof(String))]
[Noun("parent", false, "The name of the new parent for this group.", typeof(String))]
[Noun("chatcolor", false, "The new chat color r,g,b.", typeof(String))]
[Noun("permisisons", false, "The new comma seperated list of permissions.", typeof(String))]
[Noun("permissions", false, "The new comma seperated list of permissions.", typeof(String))]
[Token]
private object GroupUpdate(RestRequestArgs args)
{
Expand Down
8 changes: 4 additions & 4 deletions TShockAPI/TShock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace TShockAPI
/// This is the TShock main class. TShock is a plugin on the TerrariaServerAPI, so it extends the base TerrariaPlugin.
/// TShock also complies with the API versioning system, and defines its required API version here.
/// </summary>
[ApiVersion(1, 24)]
[ApiVersion(1, 25)]
public class TShock : TerrariaPlugin
{
/// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary>
Expand All @@ -55,7 +55,7 @@ public class TShock : TerrariaPlugin
/// <summary>CNMode - 显示当前汉化版本信息.</summary>
public static readonly string CNMode = "高级汉化-开发";
/// <summary>CNVersion - 显示当前汉化版本号.</summary>
public static readonly Version CNVersion = new Version(1, 3, 1, 0);
public static readonly Version CNVersion = new Version(1, 4, 0, 0);

/// <summary>SavePath - This is the path TShock saves its data in. This path is relative to the TerrariaServer.exe (not in ServerPlugins).</summary>
public static string SavePath = "tshock";
Expand Down Expand Up @@ -502,13 +502,13 @@ private void OnItemForceIntoChest(ForceItemIntoChestEventArgs args)

if (args.Chest != null)
{
if (Config.RegionProtectChests && !Regions.CanBuild((int)args.Position.X, (int)args.Position.Y, tsplr))
if (Config.RegionProtectChests && !Regions.CanBuild((int)args.WorldPosition.X, (int)args.WorldPosition.Y, tsplr))
{
args.Handled = true;
return;
}

if (CheckRangePermission(tsplr, (int)args.Position.X, (int)args.Position.Y))
if (CheckRangePermission(tsplr, args.Chest.x, args.Chest.y))
{
args.Handled = true;
return;
Expand Down
2 changes: 1 addition & 1 deletion TerrariaServerAPI

0 comments on commit fcab6a9

Please sign in to comment.