From 02815a23ef18dbe4805cfb3a9c6d93e8871d95f8 Mon Sep 17 00:00:00 2001 From: Zaicon Kiroshu Date: Sun, 20 Nov 2016 15:15:53 -0600 Subject: [PATCH] API Tick, Submodule Update, Changelog Update --- CHANGELOG.md | 6 ++++++ TShockAPI/TShock.cs | 9 +++------ TerrariaServerAPI | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a1aeea2..87c36bc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin * Added hardened stone to the whitelist of tiles editable by players (@DogooFalchion). * Added conversion system to send convert old MOTD format into smart text, while preserving initial line starting values to keep byte optimization for background colors Thanks to (@WhiteXZ, @Simon311, and especially @DogooFalchion) for the hard work on this issue. +## TShock 4.3.21 +* Compatibility with Terraria 1.3.3.4 (@Zaicon) +* API: Version tick 1.26 +* API: Depreciated PlayerDamage and PlayerKillMe packets (now uses PlayerHurtV2 and PlayerDeathV2) +* API: Main.rand now uses UnifiedRandom instead of Random + ## TShock 4.3.20 * Security improvement: The auth system is now automatically disabled if a superadmin exists in the database (@Enerdy). * Removed the `auth-verify` command since `auth` now serves its purpose when necessary (@Enerdy). diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 9e459ec2..36ae9ac3 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -38,6 +38,7 @@ using TerrariaApi.Server; using TShockAPI.DB; using TShockAPI.Hooks; using TShockAPI.ServerSideCharacters; +using Terraria.Utilities; namespace TShockAPI { @@ -45,7 +46,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. /// - [ApiVersion(1, 25)] + [ApiVersion(1, 26)] public class TShock : TerrariaPlugin { /// VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info. @@ -1485,11 +1486,7 @@ namespace TShockAPI // Damn you ThreadStatic and Redigit if (Main.rand == null) { - Main.rand = new Random(); - } - if (WorldGen.genRand == null) - { - WorldGen.genRand = new Random(); + Main.rand = new UnifiedRandom(); } if (args.Command == "autosave") diff --git a/TerrariaServerAPI b/TerrariaServerAPI index b403f953..6486b608 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit b403f9534f57690c0568ec8f8150afa417356cb8 +Subproject commit 6486b6083ba0d9c133489b3b7848f441384341f7