Merge pull request #264 from Arthri/update

Update OTAPI and initial issue fixes

Author: QuiCM

TerrariaServerAPI.Tests/TileGenerateTests.cs

@@ -24,13 +24,13 @@ public void Generate_Small(ICollection<ITile> 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]

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))

TerrariaServerAPI/TerrariaServerAPI.csproj

@@ -23,6 +23,6 @@
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
-		<PackageReference Include="OTAPI.Upcoming" Version="3.2.4" />
+		<PackageReference Include="OTAPI.Upcoming" Version="3.3.5" />
 	</ItemGroup>
 </Project>