Merge pull request #247 from sgkoishi/general-devel

QuiCM · web-flow · commit f205e2f342f6 · 2025-01-03T16:04:10.000+10:30
Respect OTAPI hook result
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/GameHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/GameHooks.cs
@@ -34,6 +34,10 @@ private static void OnUpdate(On.Terraria.Main.orig_Update orig, Terraria.Main in
 
 		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;
@@ -42,6 +46,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;
@@ -63,6 +71,10 @@ private static void OnStartServer(On.Terraria.Netplay.orig_StartServer orig)
 
 		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;
@@ -71,6 +83,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
@@ -40,6 +40,10 @@ private static void OnSetDefaults(On.Terraria.Item.orig_SetDefaults_int_bool_Ite
 
 		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
@@ -50,6 +50,10 @@ static void OnBroadcastChatMessage(On.Terraria.Chat.ChatHelper.orig_BroadcastCha
 
 		static void OnSendData(object sender, Hooks.NetMessage.SendDataEventArgs e)
 		{
+			if (e.Result == HookResult.Cancel)
+			{
+				return;
+			}
 			if (e.Event == HookEvent.Before)
 			{
 				var msgType = e.MsgType;
@@ -110,6 +114,10 @@ ref 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;
@@ -141,6 +149,10 @@ static void OnGreetPlayer(On.Terraria.NetMessage.orig_greetPlayer orig, int plr)
 
 		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;
@@ -149,6 +161,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
@@ -72,6 +72,10 @@ static void OnTransform(On.Terraria.NPC.orig_Transform orig, NPC npc, int newTyp
 
 		static void OnSpawn(object sender, Hooks.NPC.SpawnEventArgs e)
 		{
+			if (e.Result == HookResult.Cancel)
+			{
+				return;
+			}
 			var index = e.Index;
 			if (_hookManager.InvokeNpcSpawn(ref index))
 			{
@@ -82,6 +86,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;
@@ -129,6 +137,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
@@ -35,6 +35,10 @@ static void Main_startDedInput(On.Terraria.Main.orig_startDedInput orig)
 
 		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))
@@ -62,6 +66,10 @@ private static void WorldGen_StartHardmode(On.Terraria.WorldGen.orig_StartHardmo
 
 		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
`@@ -34,6 +34,10 @@ private static void OnUpdate(On.Terraria.Main.orig_Update orig, Terraria.Main in`
`34`	`34`
`35`	`35`	`private static void OnHardmodeTileUpdate(object sender, Hooks.WorldGen.HardmodeTileUpdateEventArgs e)`
`36`	`36`	`{`
	`37`	`+ if (e.Result == HookResult.Cancel)`
	`38`	`+ {`
	`39`	`+ return;`
	`40`	`+ }`
`37`	`41`	`if (_hookManager.InvokeGameHardmodeTileUpdate(e.X, e.Y, e.Type))`
`38`	`42`	`{`
`39`	`43`	`e.Result = HookResult.Cancel;`
`@@ -42,6 +46,10 @@ private static void OnHardmodeTileUpdate(object sender, Hooks.WorldGen.HardmodeT`
`42`	`46`
`43`	`47`	`private static void OnHardmodeTilePlace(object sender, Hooks.WorldGen.HardmodeTilePlaceEventArgs e)`
`44`	`48`	`{`
	`49`	`+ if (e.Result == HardmodeTileUpdateResult.Cancel)`
	`50`	`+ {`
	`51`	`+ return;`
	`52`	`+ }`
`45`	`53`	`if (_hookManager.InvokeGameHardmodeTileUpdate(e.X, e.Y, e.Type))`
`46`	`54`	`{`
`47`	`55`	`e.Result = HardmodeTileUpdateResult.Cancel;`
`@@ -63,6 +71,10 @@ private static void OnStartServer(On.Terraria.Netplay.orig_StartServer orig)`
`63`	`71`
`64`	`72`	`private static void OnItemMechSpawn(object sender, Hooks.Item.MechSpawnEventArgs e)`
`65`	`73`	`{`
	`74`	`+ if (e.Result == HookResult.Cancel)`
	`75`	`+ {`
	`76`	`+ return;`
	`77`	`+ }`
`66`	`78`	`if (!_hookManager.InvokeGameStatueSpawn(e.Num2, e.Num3, e.Num, (int)(e.X / 16f), (int)(e.Y / 16f), e.Type, false))`
`67`	`79`	`{`
`68`	`80`	`e.Result = HookResult.Cancel;`
`@@ -71,6 +83,10 @@ private static void OnItemMechSpawn(object sender, Hooks.Item.MechSpawnEventArgs`
`71`	`83`
`72`	`84`	`private static void OnNpcMechSpawn(object sender, Hooks.NPC.MechSpawnEventArgs e)`
`73`	`85`	`{`
	`86`	`+ if (e.Result == HookResult.Cancel)`
	`87`	`+ {`
	`88`	`+ return;`
	`89`	`+ }`
`74`	`90`	`if (!_hookManager.InvokeGameStatueSpawn(e.Num2, e.Num3, e.Num, (int)(e.X / 16f), (int)(e.Y / 16f), e.Type, true))`
`75`	`91`	`{`
`76`	`92`	`e.Result = HookResult.Cancel;`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ private static void OnSetDefaults(On.Terraria.Item.orig_SetDefaults_int_bool_Ite`
`40`	`40`
`41`	`41`	`private static void OnQuickStack(object sender, Hooks.Chest.QuickStackEventArgs e)`
`42`	`42`	`{`
	`43`	`+ if (e.Result == HookResult.Cancel)`
	`44`	`+ {`
	`45`	`+ return;`
	`46`	`+ }`
`43`	`47`	`if (_hookManager.InvokeItemForceIntoChest(Main.chest[e.ChestIndex], e.Item, Main.player[e.PlayerId]))`
`44`	`48`	`{`
`45`	`49`	`e.Result = HookResult.Cancel;`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,10 @@ static void OnBroadcastChatMessage(On.Terraria.Chat.ChatHelper.orig_BroadcastCha`
`50`	`50`
`51`	`51`	`static void OnSendData(object sender, Hooks.NetMessage.SendDataEventArgs e)`
`52`	`52`	`{`
	`53`	`+ if (e.Result == HookResult.Cancel)`
	`54`	`+ {`
	`55`	`+ return;`
	`56`	`+ }`
`53`	`57`	`if (e.Event == HookEvent.Before)`
`54`	`58`	`{`
`55`	`59`	`var msgType = e.MsgType;`
`@@ -110,6 +114,10 @@ ref packet`
`110`	`114`
`111`	`115`	`static void OnReceiveData(object sender, Hooks.MessageBuffer.GetDataEventArgs e)`
`112`	`116`	`{`
	`117`	`+ if (e.Result == HookResult.Cancel)`
	`118`	`+ {`
	`119`	`+ return;`
	`120`	`+ }`
`113`	`121`	`if (!Enum.IsDefined(typeof(PacketTypes), (int)e.PacketId))`
`114`	`122`	`{`
`115`	`123`	`e.Result = HookResult.Cancel;`
`@@ -141,6 +149,10 @@ static void OnGreetPlayer(On.Terraria.NetMessage.orig_greetPlayer orig, int plr)`
`141`	`149`
`142`	`150`	`static void OnSendBytes(object sender, Hooks.NetMessage.SendBytesEventArgs e)`
`143`	`151`	`{`
	`152`	`+ if (e.Result == HookResult.Cancel)`
	`153`	`+ {`
	`154`	`+ return;`
	`155`	`+ }`
`144`	`156`	`if (_hookManager.InvokeNetSendBytes(Netplay.Clients[e.RemoteClient], e.Data, e.Offset, e.Size))`
`145`	`157`	`{`
`146`	`158`	`e.Result = HookResult.Cancel;`
`@@ -149,6 +161,10 @@ static void OnSendBytes(object sender, Hooks.NetMessage.SendBytesEventArgs e)`
`149`	`161`
`150`	`162`	`static void OnNameCollision(object sender, Hooks.MessageBuffer.NameCollisionEventArgs e)`
`151`	`163`	`{`
	`164`	`+ if (e.Result == HookResult.Cancel)`
	`165`	`+ {`
	`166`	`+ return;`
	`167`	`+ }`
`152`	`168`	`if (_hookManager.InvokeNetNameCollision(e.Player.whoAmI, e.Player.name))`
`153`	`169`	`{`
`154`	`170`	`e.Result = HookResult.Cancel;`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,10 @@ static void OnTransform(On.Terraria.NPC.orig_Transform orig, NPC npc, int newTyp`
`72`	`72`
`73`	`73`	`static void OnSpawn(object sender, Hooks.NPC.SpawnEventArgs e)`
`74`	`74`	`{`
	`75`	`+ if (e.Result == HookResult.Cancel)`
	`76`	`+ {`
	`77`	`+ return;`
	`78`	`+ }`
`75`	`79`	`var index = e.Index;`
`76`	`80`	`if (_hookManager.InvokeNpcSpawn(ref index))`
`77`	`81`	`{`
`@@ -82,6 +86,10 @@ static void OnSpawn(object sender, Hooks.NPC.SpawnEventArgs e)`
`82`	`86`
`83`	`87`	`static void OnDropLoot(object sender, Hooks.NPC.DropLootEventArgs e)`
`84`	`88`	`{`
	`89`	`+ if (e.Result == HookResult.Cancel)`
	`90`	`+ {`
	`91`	`+ return;`
	`92`	`+ }`
`85`	`93`	`if (e.Event == HookEvent.Before)`
`86`	`94`	`{`
`87`	`95`	`var Width = e.Width;`
`@@ -129,6 +137,10 @@ ref reverseLookup`
`129`	`137`
`130`	`138`	`static void OnBossBagItem(object sender, Hooks.NPC.BossBagEventArgs e)`
`131`	`139`	`{`
	`140`	`+ if (e.Result == HookResult.Cancel)`
	`141`	`+ {`
	`142`	`+ return;`
	`143`	`+ }`
`132`	`144`	`var Width = e.Width;`
`133`	`145`	`var Height = e.Height;`
`134`	`146`	`var Type = e.Type;`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ static void Main_startDedInput(On.Terraria.Main.orig_startDedInput orig)`
`35`	`35`
`36`	`36`	`static void OnProcess(object sender, Hooks.Main.CommandProcessEventArgs e)`
`37`	`37`	`{`
	`38`	`+ if (e.Result == HookResult.Cancel)`
	`39`	`+ {`
	`40`	`+ return;`
	`41`	`+ }`
`38`	`42`	`if (_hookManager.InvokeServerCommand(e.Command))`
`39`	`43`	`{`
`40`	`44`	`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))`
`@@ -62,6 +66,10 @@ private static void WorldGen_StartHardmode(On.Terraria.WorldGen.orig_StartHardmo`
`62`	`66`
`63`	`67`	`static void OnDropMeteor(object sender, Hooks.WorldGen.MeteorEventArgs e)`
`64`	`68`	`{`
	`69`	`+ if (e.Result == HookResult.Cancel)`
	`70`	`+ {`
	`71`	`+ return;`
	`72`	`+ }`
`65`	`73`	`if (_hookManager.InvokeWorldMeteorDrop(e.X, e.Y))`
`66`	`74`	`{`
`67`	`75`	`e.Result = HookResult.Cancel;`