Skip to content

Commit

Permalink
更新到汉化版本v1.2(对应版本v4.3.17)
Browse files Browse the repository at this point in the history
  • Loading branch information
mistzzt committed Jul 28, 2016
2 parents 5297252 + fb6d888 commit 5456d7d
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 8 deletions.
18 changes: 16 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,25 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin

## Upcoming Changes

* Updated superadmin behaviour to conform to expected behaviour (@WhiteXZ)
## TShock 4.3.17

* Compatibility with Terraria 1.3.2.1
* Updated superadmin behaviour to conform to expected behaviour (@WhiteXZ, @Patrikk)
* Fixed a crash involving teleporters and dressers (@WhiteXZ)
* Fixed pressure plates (@Enerdy @Patrikk)
* Fixed pressure plates (@Enerdy, @Patrikk)
* Fixed a deadlock in wiring (@Wolfje)
* Fixed a crash in wiring (@Patrikk)
* Improved network syncing on client joins (@Patrikk)
* The Presserator can now place actuators (@ProfessorXZ)
* Resolved a region error when removing unlisted users from regions (@WhiteXZ)
* Added a `SetDungeon` command to set the dungeon position (@webmilio)
* The currently running world name is now part of the server application's title (@webmilio)
* Gem locks can now be region protected (@mistzzt)
* Players can now place sensors (@mistzzt)
* Repackaged GeoIP with TShock so that GeoIP works (@Enerdy)
* Added permissions to use sundials and start/stop parties (@Patrikk)
* Added an announcement box hook (@mistzzt)
* Added the ability to choose what type of world (crimson/corruption) you generate (@NoNiMad)

## TShock 4.3.16

Expand Down
20 changes: 19 additions & 1 deletion TShockAPI/GetDataHandlers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,8 @@ public static void InitGetDataHandler()
{ PacketTypes.CompleteAnglerQuest, HandleCompleteAnglerQuest },
{ PacketTypes.NumberOfAnglerQuestsCompleted, HandleNumberOfAnglerQuestsCompleted },
{ PacketTypes.MassWireOperation, HandleMassWireOperation },
{ PacketTypes.GemLockToggle, HandleGemLockToggle }
{ PacketTypes.GemLockToggle, HandleGemLockToggle },
{ PacketTypes.ToggleParty, HandleToggleParty }
};
}

Expand Down Expand Up @@ -3514,6 +3515,12 @@ private static bool HandleSpecial(GetDataHandlerArgs args)
return true;
}

if (type == 3 && !args.Player.HasPermission(Permissions.usesundial))
{
args.Player.SendErrorMessage("你没有使用日晷的权限!");
return true;
}

return false;
}

Expand Down Expand Up @@ -3993,5 +4000,16 @@ private static bool HandleGemLockToggle(GetDataHandlerArgs args)

return false;
}

private static bool HandleToggleParty(GetDataHandlerArgs args)
{
if (args.Player != null && !args.Player.HasPermission(Permissions.toggleparty))
{
args.Player.SendErrorMessage("你没有举行派对的权限!");
return true;
}

return false;
}
}
}
7 changes: 6 additions & 1 deletion TShockAPI/Permissions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@ public static class Permissions
[Description("User can set the time.")]
public static readonly string time = "tshock.world.time.set";

[Description("Player can use the Enchanted Sundial item.")]
public static readonly string usesundial = "tshock.world.time.usesundial";

[Description("User can grow plants.")]
public static readonly string grow = "tshock.world.grow";

Expand Down Expand Up @@ -329,6 +332,9 @@ public static class Permissions
[Description("User can modify the wind.")]
public static readonly string wind = "tshock.world.wind";

[Description("Player can toggle party event.")]
public static readonly string toggleparty = "tshock.world.toggleparty";

// Non-grouped

[Description("User can clear items or projectiles.")]
Expand Down Expand Up @@ -378,7 +384,6 @@ public static class Permissions

[Description("Player can place banned tiles.")]
public static readonly string canusebannedtiles = "tshock.tiles.usebanned";

/// <summary>
/// Lists all commands associated with a given permission
/// </summary>
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.16")]
[assembly: AssemblyFileVersion("4.3.16")]
[assembly: AssemblyVersion("4.3.17")]
[assembly: AssemblyFileVersion("4.3.17")]
2 changes: 1 addition & 1 deletion TShockAPI/TShock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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, 1, 3, 0);
public static readonly Version CNVersion = new Version(1, 2, 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
2 changes: 1 addition & 1 deletion TerrariaServerAPI

0 comments on commit 5456d7d

Please sign in to comment.