Expand boss bag hook to DropItemLocalPerClientAndSetNPCMoneyTo0

see fix drop boss bag hook not working properly #131

Co-Authored-By: Sors <[email protected]>

Author: SignatureBeef

OTAPI.Patcher/Targets/PCServerTarget.cs

@@ -211,6 +211,7 @@ public async Task PatchAsync()
                             mm.Module.GetType("Terraria.NPC").CreateHooks(mm);
                             mm.Module.GetType("Terraria.WorldGen").CreateHooks(mm);
                             mm.Module.GetType("Terraria.Chat.ChatHelper").CreateHooks(mm);
+                            mm.Module.GetType("Terraria.GameContent.ItemDropRules.CommonCode").CreateHooks(mm);
                             mm.Module.GetType("Terraria.IO.WorldFile").CreateHooks(mm);
                             mm.Module.GetType("Terraria.Net.NetManager").CreateHooks(mm);
                             mm.Module.GetType("Terraria.Projectile").CreateHooks(mm);

OTAPI.Scripts/Mods/HookNpcBossBag.Server.cs

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2020 DeathCradle
+Copyright (C) 2020-2024 SignatureBeef & sors89
 
 This file is part of Open Terraria API v3 (OTAPI)
 
@@ -26,46 +26,52 @@ You should have received a copy of the GNU General Public License
 using Mono.Cecil.Cil;
 
 /// <summary>
-/// @doc Creates Hooks.NPC.BossBag. Allows plugins to cancel boss bag items.
+/// @doc Creates Hooks.NPC.BossBag. Allows plugins to customize boss loot as well as the distribution.
 /// </summary>
-[Modification(ModType.PreMerge, "Hooking npc boss bags")]
+[Modification(ModType.PreMerge, "Hooking NPC Boss Bag drops")]
 [MonoMod.MonoModIgnore]
 void HookNpcBossBag(ModFramework.ModFwModder modder)
 {
     // replace NewItem calls, and handle the -1 result to cancel the method from actioning.
-
-    var csr = modder.GetILCursor(() => (new Terraria.NPC()).DropItemInstanced(default, default, 0, 0, false));
-    var callback = csr.Module.ImportReference(
+    foreach (var csr in new[] {
+         modder.GetILCursor(() => (new Terraria.NPC()).DropItemInstanced(default, default, 0, 0, false)),
+         modder.GetILCursor(() => Terraria.GameContent.ItemDropRules.CommonCode.DropItemLocalPerClientAndSetNPCMoneyTo0(default, default, default, default))
+    })
+    {
+        var callback = csr.Module.ImportReference(
 #if TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
-        modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeBossBag(null, 0, 0, 0, 0, 0, 0, false, 0, false, false, null))
+            modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeBossBag(null, 0, 0, 0, 0, 0, 0, false, 0, false, false, null))
 #else
-        modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeBossBag(0, 0, 0, 0, 0, 0, false, 0, false, false, null))
+            modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeBossBag(0, 0, 0, 0, 0, 0, false, 0, false, false, null))
 #endif
-    );
+        );
 
-    var instructions = csr.Body.Instructions.Where(x => x.OpCode == OpCodes.Call
-                                                        && x.Operand is MethodReference mref && mref.Name == "NewItem"
-                                                        && x.Next.OpCode == OpCodes.Stloc_0);
+        var instructions = csr.Body.Instructions.Where(x => x.OpCode == OpCodes.Call
+                                                            && x.Operand is MethodReference mref && mref.Name == "NewItem"
+                                                            && x.Next.OpCode == OpCodes.Stloc_0);
 
-    if (instructions.Count() != 1) throw new NotSupportedException("Only one server NewItem call expected in DropBossBags.");
+        if (instructions.Count() != 1) throw new NotSupportedException("Only one server NewItem call expected in DropBossBags.");
 
-    var ins = instructions.First();
+        var ins = instructions.First();
 
-    ins.Operand = callback;
+        ins.Operand = callback;
 
-    csr.Goto(ins);
-    csr.EmitAll(
-        new { OpCodes.Ldarg_0 }
-    );
+        csr.Goto(ins);
+        csr.EmitAll(
+             // reference to the npc works for both the instance, and the static method, only since the latter has the 
+             // variable first in the argument list.
+            new { OpCodes.Ldarg_0 }
+        );
 
-    csr.Goto(ins.Next.Next);
-    csr.EmitAll(
-        new { OpCodes.Ldloc_0 },
-        new { OpCodes.Ldc_I4_M1 },
-        new { OpCodes.Ceq },
-        new { OpCodes.Brfalse_S, Operand = ins.Next.Next },
-        new { OpCodes.Ret }
-    );
+        csr.Goto(ins.Next.Next);
+        csr.EmitAll(
+            new { OpCodes.Ldloc_0 },
+            new { OpCodes.Ldc_I4_M1 },
+            new { OpCodes.Ceq },
+            new { OpCodes.Brfalse_S, Operand = ins.Next.Next },
+            new { OpCodes.Ret }
+        );
+    }
 }
 
 namespace OTAPI
@@ -142,4 +148,4 @@ Terraria.NPC npc
             }
         }
     }
-}
+}