Merge remote-tracking branch 'signature/update-1456' into general-devel

hakusaro · hakusaro · commit 062969f99d0c · 2026-03-12T03:25:50.000+09:00
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/WorldHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/WorldHooks.cs
@@ -15,7 +15,7 @@ public static void AttachTo(HookManager hookManager)
 	{
 		_hookManager = hookManager;
 
-		HookEvents.Terraria.IO.WorldFile.SaveWorld_Boolean_Boolean += WorldFile_SaveWorld;
+		HookEvents.Terraria.IO.WorldFile._SaveWorld += WorldFile_SaveWorld;
 		HookEvents.Terraria.WorldGen.StartHardmode += WorldGen_StartHardmode;
 		HookEvents.Terraria.WorldGen.SpreadGrass += WorldGen_SpreadGrass;
 		HookEvents.Terraria.Main.checkXMas += Main_checkXMas;
@@ -48,7 +48,7 @@ static void OnPressurePlate(object sender, Hooks.Collision.PressurePlateEventArg
 		}
 	}
 
-	static void WorldFile_SaveWorld(object? sender, HookEvents.Terraria.IO.WorldFile.SaveWorld_Boolean_BooleanEventArgs args)
+	static void WorldFile_SaveWorld(object? sender, HookEvents.Terraria.IO.WorldFile._SaveWorldEventArgs args)
 	{
 		if (!args.ContinueExecution) return;
 		if (_hookManager.InvokeWorldSave(args.resetTime))
diff --git a/TerrariaServerAPI/TerrariaServerAPI.csproj b/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.3.10" />
+		<PackageReference Include="OTAPI.Upcoming" Version="3.3.11" />
 	</ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static void AttachTo(HookManager hookManager)`
`15`	`15`	`{`
`16`	`16`	`_hookManager = hookManager;`
`17`	`17`
`18`		`- HookEvents.Terraria.IO.WorldFile.SaveWorld_Boolean_Boolean += WorldFile_SaveWorld;`
	`18`	`+ HookEvents.Terraria.IO.WorldFile._SaveWorld += WorldFile_SaveWorld;`
`19`	`19`	`HookEvents.Terraria.WorldGen.StartHardmode += WorldGen_StartHardmode;`
`20`	`20`	`HookEvents.Terraria.WorldGen.SpreadGrass += WorldGen_SpreadGrass;`
`21`	`21`	`HookEvents.Terraria.Main.checkXMas += Main_checkXMas;`
`@@ -48,7 +48,7 @@ static void OnPressurePlate(object sender, Hooks.Collision.PressurePlateEventArg`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- static void WorldFile_SaveWorld(object? sender, HookEvents.Terraria.IO.WorldFile.SaveWorld_Boolean_BooleanEventArgs args)`
	`51`	`+ static void WorldFile_SaveWorld(object? sender, HookEvents.Terraria.IO.WorldFile._SaveWorldEventArgs args)`
`52`	`52`	`{`
`53`	`53`	`if (!args.ContinueExecution) return;`
`54`	`54`	`if (_hookManager.InvokeWorldSave(args.resetTime))`