diff --git a/TerrariaServerAPI.Tests/TileGenerateTests.cs b/TerrariaServerAPI.Tests/TileGenerateTests.cs index b2661383..37c839a3 100644 --- a/TerrariaServerAPI.Tests/TileGenerateTests.cs +++ b/TerrariaServerAPI.Tests/TileGenerateTests.cs @@ -24,13 +24,13 @@ public void Generate_Small(ICollection provider) Main.tile = provider; WorldGen.generatingWorld = true; - Main.rand = new UnifiedRandom(9999); - WorldGen.gen = true; + Main.ActiveWorldFileData.SetSeed("seeeeeeeeeed"); + Main.rand = new UnifiedRandom(Main.ActiveWorldFileData.Seed); Main.menuMode = 888; WorldGen.clearWorld(); - WorldGen.GenerateWorld(9999); + WorldGen.GenerateWorld(); } [Test] diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/ItemHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/ItemHooks.cs index 5fa87537..268d6a79 100644 --- a/TerrariaServerAPI/TerrariaApi.Server/Hooking/ItemHooks.cs +++ b/TerrariaServerAPI/TerrariaApi.Server/Hooking/ItemHooks.cs @@ -15,7 +15,7 @@ public static void AttachTo(HookManager hookManager) { _hookManager = hookManager; - HookEvents.Terraria.Item.SetDefaults_Int32_Boolean_ItemVariant += OnSetDefaults; + HookEvents.Terraria.Item.SetDefaults += OnSetDefaults; HookEvents.Terraria.Item.netDefaults += OnNetDefaults; Hooks.Chest.QuickStack += OnQuickStack; @@ -28,7 +28,7 @@ private static void OnNetDefaults(Item item, HookEvents.Terraria.Item.netDefault args.ContinueExecution = false; } - private static void OnSetDefaults(Item item, HookEvents.Terraria.Item.SetDefaults_Int32_Boolean_ItemVariantEventArgs args) + private static void OnSetDefaults(Item item, HookEvents.Terraria.Item.SetDefaultsEventArgs args) { if (!args.ContinueExecution) return; if (_hookManager.InvokeItemSetDefaultsInt(ref args.Type, item, args.variant)) diff --git a/TerrariaServerAPI/TerrariaServerAPI.csproj b/TerrariaServerAPI/TerrariaServerAPI.csproj index 616e64dd..cc6fbb00 100644 --- a/TerrariaServerAPI/TerrariaServerAPI.csproj +++ b/TerrariaServerAPI/TerrariaServerAPI.csproj @@ -23,6 +23,7 @@ - + +