Merge remote-tracking branch 'upstream/general-devel' into net9-upgrade

SignatureBeef · SignatureBeef · commit d5973251e02f · 2025-01-03T21:39:28.000+10:00
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/GameHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/GameHooks.cs
@@ -35,6 +35,10 @@ private static void OnUpdate(Terraria.Main instance, HookEvents.Terraria.Main.Up
 
 	private static void OnHardmodeTileUpdate(object sender, Hooks.WorldGen.HardmodeTileUpdateEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (_hookManager.InvokeGameHardmodeTileUpdate(e.X, e.Y, e.Type))
 		{
 			e.Result = HookResult.Cancel;
@@ -43,6 +47,10 @@ private static void OnHardmodeTileUpdate(object sender, Hooks.WorldGen.HardmodeT
 
 	private static void OnHardmodeTilePlace(object sender, Hooks.WorldGen.HardmodeTilePlaceEventArgs e)
 	{
+		if (e.Result == HardmodeTileUpdateResult.Cancel)
+		{
+			return;
+		}
 		if (_hookManager.InvokeGameHardmodeTileUpdate(e.X, e.Y, e.Type))
 		{
 			e.Result = HardmodeTileUpdateResult.Cancel;
@@ -64,6 +72,10 @@ private static void OnStartServer(object? sender, HookEvents.Terraria.Netplay.St
 
 	private static void OnItemMechSpawn(object sender, Hooks.Item.MechSpawnEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (!_hookManager.InvokeGameStatueSpawn(e.Num2, e.Num3, e.Num, (int)(e.X / 16f), (int)(e.Y / 16f), e.Type, false))
 		{
 			e.Result = HookResult.Cancel;
@@ -72,6 +84,10 @@ private static void OnItemMechSpawn(object sender, Hooks.Item.MechSpawnEventArgs
 
 	private static void OnNpcMechSpawn(object sender, Hooks.NPC.MechSpawnEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (!_hookManager.InvokeGameStatueSpawn(e.Num2, e.Num3, e.Num, (int)(e.X / 16f), (int)(e.Y / 16f), e.Type, true))
 		{
 			e.Result = HookResult.Cancel;
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/ItemHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/ItemHooks.cs
@@ -37,6 +37,10 @@ private static void OnSetDefaults(Item item, HookEvents.Terraria.Item.SetDefault
 
 	private static void OnQuickStack(object sender, Hooks.Chest.QuickStackEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (_hookManager.InvokeItemForceIntoChest(Main.chest[e.ChestIndex], e.Item, Main.player[e.PlayerId]))
 		{
 			e.Result = HookResult.Cancel;
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs
@@ -47,6 +47,10 @@ static void OnBroadcastChatMessage(object? sender, HookEvents.Terraria.Chat.Chat
 
 	static void OnSendData(object sender, Hooks.NetMessage.SendDataEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (e.Event == HookEvent.Before)
 		{
 			var msgType = e.MsgType;
@@ -108,6 +112,10 @@ ref args.packet
 
 	static void OnReceiveData(object sender, Hooks.MessageBuffer.GetDataEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (!Enum.IsDefined(typeof(PacketTypes), (int)e.PacketId))
 		{
 			e.Result = HookResult.Cancel;
@@ -138,6 +146,10 @@ static void OnGreetPlayer(object? sender, HookEvents.Terraria.NetMessage.greetPl
 
 	static void OnSendBytes(object sender, Hooks.NetMessage.SendBytesEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (_hookManager.InvokeNetSendBytes(Netplay.Clients[e.RemoteClient], e.Data, e.Offset, e.Size))
 		{
 			e.Result = HookResult.Cancel;
@@ -146,6 +158,10 @@ static void OnSendBytes(object sender, Hooks.NetMessage.SendBytesEventArgs e)
 
 	static void OnNameCollision(object sender, Hooks.MessageBuffer.NameCollisionEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (_hookManager.InvokeNetNameCollision(e.Player.whoAmI, e.Player.name))
 		{
 			e.Result = HookResult.Cancel;
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/NpcHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/NpcHooks.cs
@@ -69,6 +69,10 @@ static void OnTransform(NPC npc, HookEvents.Terraria.NPC.TransformEventArgs args
 
 	static void OnSpawn(object sender, Hooks.NPC.SpawnEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		var index = e.Index;
 		if (_hookManager.InvokeNpcSpawn(ref index))
 		{
@@ -79,6 +83,10 @@ static void OnSpawn(object sender, Hooks.NPC.SpawnEventArgs e)
 
 	static void OnDropLoot(object sender, Hooks.NPC.DropLootEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (e.Event == HookEvent.Before)
 		{
 			var Width = e.Width;
@@ -126,6 +134,10 @@ ref reverseLookup
 
 	static void OnBossBagItem(object sender, Hooks.NPC.BossBagEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		var Width = e.Width;
 		var Height = e.Height;
 		var Type = e.Type;
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/ServerHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/ServerHooks.cs
@@ -38,6 +38,10 @@ static void Main_startDedInput(object? sender, HookEvents.Terraria.Main.startDed
 
 	static void OnProcess(object sender, Hooks.Main.CommandProcessEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (_hookManager.InvokeServerCommand(e.Command))
 		{
 			e.Result = HookResult.Cancel;
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/WiringHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/WiringHooks.cs
@@ -20,6 +20,10 @@ public static void AttachTo(HookManager hookManager)
 
 	static void OnAnnouncementBox(object sender, Hooks.Wiring.AnnouncementBoxEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (_hookManager.InvokeWireTriggerAnnouncementBox(Wiring.CurrentUser, e.X, e.Y, e.SignId, Main.sign[e.SignId].text))
 		{
 			e.Result = HookResult.Cancel;
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/WorldHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/WorldHooks.cs
@@ -27,6 +27,10 @@ public static void AttachTo(HookManager hookManager)
 
 	static void OnPressurePlate(object sender, Hooks.Collision.PressurePlateEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (e.Entity is NPC npc)
 		{
 			if (_hookManager.InvokeNpcTriggerPressurePlate(npc, e.X, e.Y))
@@ -60,6 +64,10 @@ private static void WorldGen_StartHardmode(object? sender, HookEvents.Terraria.W
 
 	static void OnDropMeteor(object sender, Hooks.WorldGen.MeteorEventArgs e)
 	{
+		if (e.Result == HookResult.Cancel)
+		{
+			return;
+		}
 		if (_hookManager.InvokeWorldMeteorDrop(e.X, e.Y))
 		{
 			e.Result = HookResult.Cancel;

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ private static void OnUpdate(Terraria.Main instance, HookEvents.Terraria.Main.Up`
`35`	`35`
`36`	`36`	`private static void OnHardmodeTileUpdate(object sender, Hooks.WorldGen.HardmodeTileUpdateEventArgs e)`
`37`	`37`	`{`
	`38`	`+ if (e.Result == HookResult.Cancel)`
	`39`	`+ {`
	`40`	`+ return;`
	`41`	`+ }`
`38`	`42`	`if (_hookManager.InvokeGameHardmodeTileUpdate(e.X, e.Y, e.Type))`
`39`	`43`	`{`
`40`	`44`	`e.Result = HookResult.Cancel;`
`@@ -43,6 +47,10 @@ private static void OnHardmodeTileUpdate(object sender, Hooks.WorldGen.HardmodeT`
`43`	`47`
`44`	`48`	`private static void OnHardmodeTilePlace(object sender, Hooks.WorldGen.HardmodeTilePlaceEventArgs e)`
`45`	`49`	`{`
	`50`	`+ if (e.Result == HardmodeTileUpdateResult.Cancel)`
	`51`	`+ {`
	`52`	`+ return;`
	`53`	`+ }`
`46`	`54`	`if (_hookManager.InvokeGameHardmodeTileUpdate(e.X, e.Y, e.Type))`
`47`	`55`	`{`
`48`	`56`	`e.Result = HardmodeTileUpdateResult.Cancel;`
`@@ -64,6 +72,10 @@ private static void OnStartServer(object? sender, HookEvents.Terraria.Netplay.St`
`64`	`72`
`65`	`73`	`private static void OnItemMechSpawn(object sender, Hooks.Item.MechSpawnEventArgs e)`
`66`	`74`	`{`
	`75`	`+ if (e.Result == HookResult.Cancel)`
	`76`	`+ {`
	`77`	`+ return;`
	`78`	`+ }`
`67`	`79`	`if (!_hookManager.InvokeGameStatueSpawn(e.Num2, e.Num3, e.Num, (int)(e.X / 16f), (int)(e.Y / 16f), e.Type, false))`
`68`	`80`	`{`
`69`	`81`	`e.Result = HookResult.Cancel;`
`@@ -72,6 +84,10 @@ private static void OnItemMechSpawn(object sender, Hooks.Item.MechSpawnEventArgs`
`72`	`84`
`73`	`85`	`private static void OnNpcMechSpawn(object sender, Hooks.NPC.MechSpawnEventArgs e)`
`74`	`86`	`{`
	`87`	`+ if (e.Result == HookResult.Cancel)`
	`88`	`+ {`
	`89`	`+ return;`
	`90`	`+ }`
`75`	`91`	`if (!_hookManager.InvokeGameStatueSpawn(e.Num2, e.Num3, e.Num, (int)(e.X / 16f), (int)(e.Y / 16f), e.Type, true))`
`76`	`92`	`{`
`77`	`93`	`e.Result = HookResult.Cancel;`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ private static void OnSetDefaults(Item item, HookEvents.Terraria.Item.SetDefault`
`37`	`37`
`38`	`38`	`private static void OnQuickStack(object sender, Hooks.Chest.QuickStackEventArgs e)`
`39`	`39`	`{`
	`40`	`+ if (e.Result == HookResult.Cancel)`
	`41`	`+ {`
	`42`	`+ return;`
	`43`	`+ }`
`40`	`44`	`if (_hookManager.InvokeItemForceIntoChest(Main.chest[e.ChestIndex], e.Item, Main.player[e.PlayerId]))`
`41`	`45`	`{`
`42`	`46`	`e.Result = HookResult.Cancel;`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ static void OnBroadcastChatMessage(object? sender, HookEvents.Terraria.Chat.Chat`
`47`	`47`
`48`	`48`	`static void OnSendData(object sender, Hooks.NetMessage.SendDataEventArgs e)`
`49`	`49`	`{`
	`50`	`+ if (e.Result == HookResult.Cancel)`
	`51`	`+ {`
	`52`	`+ return;`
	`53`	`+ }`
`50`	`54`	`if (e.Event == HookEvent.Before)`
`51`	`55`	`{`
`52`	`56`	`var msgType = e.MsgType;`
`@@ -108,6 +112,10 @@ ref args.packet`
`108`	`112`
`109`	`113`	`static void OnReceiveData(object sender, Hooks.MessageBuffer.GetDataEventArgs e)`
`110`	`114`	`{`
	`115`	`+ if (e.Result == HookResult.Cancel)`
	`116`	`+ {`
	`117`	`+ return;`
	`118`	`+ }`
`111`	`119`	`if (!Enum.IsDefined(typeof(PacketTypes), (int)e.PacketId))`
`112`	`120`	`{`
`113`	`121`	`e.Result = HookResult.Cancel;`
`@@ -138,6 +146,10 @@ static void OnGreetPlayer(object? sender, HookEvents.Terraria.NetMessage.greetPl`
`138`	`146`
`139`	`147`	`static void OnSendBytes(object sender, Hooks.NetMessage.SendBytesEventArgs e)`
`140`	`148`	`{`
	`149`	`+ if (e.Result == HookResult.Cancel)`
	`150`	`+ {`
	`151`	`+ return;`
	`152`	`+ }`
`141`	`153`	`if (_hookManager.InvokeNetSendBytes(Netplay.Clients[e.RemoteClient], e.Data, e.Offset, e.Size))`
`142`	`154`	`{`
`143`	`155`	`e.Result = HookResult.Cancel;`
`@@ -146,6 +158,10 @@ static void OnSendBytes(object sender, Hooks.NetMessage.SendBytesEventArgs e)`
`146`	`158`
`147`	`159`	`static void OnNameCollision(object sender, Hooks.MessageBuffer.NameCollisionEventArgs e)`
`148`	`160`	`{`
	`161`	`+ if (e.Result == HookResult.Cancel)`
	`162`	`+ {`
	`163`	`+ return;`
	`164`	`+ }`
`149`	`165`	`if (_hookManager.InvokeNetNameCollision(e.Player.whoAmI, e.Player.name))`
`150`	`166`	`{`
`151`	`167`	`e.Result = HookResult.Cancel;`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ static void OnTransform(NPC npc, HookEvents.Terraria.NPC.TransformEventArgs args`
`69`	`69`
`70`	`70`	`static void OnSpawn(object sender, Hooks.NPC.SpawnEventArgs e)`
`71`	`71`	`{`
	`72`	`+ if (e.Result == HookResult.Cancel)`
	`73`	`+ {`
	`74`	`+ return;`
	`75`	`+ }`
`72`	`76`	`var index = e.Index;`
`73`	`77`	`if (_hookManager.InvokeNpcSpawn(ref index))`
`74`	`78`	`{`
`@@ -79,6 +83,10 @@ static void OnSpawn(object sender, Hooks.NPC.SpawnEventArgs e)`
`79`	`83`
`80`	`84`	`static void OnDropLoot(object sender, Hooks.NPC.DropLootEventArgs e)`
`81`	`85`	`{`
	`86`	`+ if (e.Result == HookResult.Cancel)`
	`87`	`+ {`
	`88`	`+ return;`
	`89`	`+ }`
`82`	`90`	`if (e.Event == HookEvent.Before)`
`83`	`91`	`{`
`84`	`92`	`var Width = e.Width;`
`@@ -126,6 +134,10 @@ ref reverseLookup`
`126`	`134`
`127`	`135`	`static void OnBossBagItem(object sender, Hooks.NPC.BossBagEventArgs e)`
`128`	`136`	`{`
	`137`	`+ if (e.Result == HookResult.Cancel)`
	`138`	`+ {`
	`139`	`+ return;`
	`140`	`+ }`
`129`	`141`	`var Width = e.Width;`
`130`	`142`	`var Height = e.Height;`
`131`	`143`	`var Type = e.Type;`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ static void Main_startDedInput(object? sender, HookEvents.Terraria.Main.startDed`
`38`	`38`
`39`	`39`	`static void OnProcess(object sender, Hooks.Main.CommandProcessEventArgs e)`
`40`	`40`	`{`
	`41`	`+ if (e.Result == HookResult.Cancel)`
	`42`	`+ {`
	`43`	`+ return;`
	`44`	`+ }`
`41`	`45`	`if (_hookManager.InvokeServerCommand(e.Command))`
`42`	`46`	`{`
`43`	`47`	`e.Result = HookResult.Cancel;`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ public static void AttachTo(HookManager hookManager)`
`20`	`20`
`21`	`21`	`static void OnAnnouncementBox(object sender, Hooks.Wiring.AnnouncementBoxEventArgs e)`
`22`	`22`	`{`
	`23`	`+ if (e.Result == HookResult.Cancel)`
	`24`	`+ {`
	`25`	`+ return;`
	`26`	`+ }`
`23`	`27`	`if (_hookManager.InvokeWireTriggerAnnouncementBox(Wiring.CurrentUser, e.X, e.Y, e.SignId, Main.sign[e.SignId].text))`
`24`	`28`	`{`
`25`	`29`	`e.Result = HookResult.Cancel;`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public static void AttachTo(HookManager hookManager)`
`27`	`27`
`28`	`28`	`static void OnPressurePlate(object sender, Hooks.Collision.PressurePlateEventArgs e)`
`29`	`29`	`{`
	`30`	`+ if (e.Result == HookResult.Cancel)`
	`31`	`+ {`
	`32`	`+ return;`
	`33`	`+ }`
`30`	`34`	`if (e.Entity is NPC npc)`
`31`	`35`	`{`
`32`	`36`	`if (_hookManager.InvokeNpcTriggerPressurePlate(npc, e.X, e.Y))`
`@@ -60,6 +64,10 @@ private static void WorldGen_StartHardmode(object? sender, HookEvents.Terraria.W`
`60`	`64`
`61`	`65`	`static void OnDropMeteor(object sender, Hooks.WorldGen.MeteorEventArgs e)`
`62`	`66`	`{`
	`67`	`+ if (e.Result == HookResult.Cancel)`
	`68`	`+ {`
	`69`	`+ return;`
	`70`	`+ }`
`63`	`71`	`if (_hookManager.InvokeWorldMeteorDrop(e.X, e.Y))`
`64`	`72`	`{`
`65`	`73`	`e.Result = HookResult.Cancel;`