Fixed custom loot dropping alongside original loot and added Zombie Loot Manager compatibility

Author: RestoreMonarchy

AnimalManager/AnimalManager.csproj

@@ -4,12 +4,12 @@
     <TargetFramework>net48</TargetFramework>
 	  <LangVersion>latest</LangVersion>
 	  <RootNamespace>RestoreMonarchy.AnimalManager</RootNamespace>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
 	  <PackageReference Include="Lib.Harmony" Version="2.3.3" />
 	  <PackageReference Include="RestoreMonarchy.RocketRedist" Version="3.*" ExcludeAssets="runtime" />
   </ItemGroup>
 
-</Project>
+</Project>

AnimalManager/AnimalManagerPlugin.cs

@@ -1,4 +1,4 @@
-using HarmonyLib;
+using HarmonyLib;
 using RestoreMonarchy.AnimalManager.Configurations;
 using RestoreMonarchy.AnimalManager.Helpers;
 using RestoreMonarchy.AnimalManager.Models;
@@ -9,6 +9,8 @@
 using Rocket.Unturned.Chat;
 using SDG.Unturned;
 using System;
+using System.Collections.Generic;
+using System.Reflection;
 using UnityEngine;
 using AnimalSpawn = RestoreMonarchy.AnimalManager.Models.AnimalSpawn;
 using Logger = Rocket.Core.Logging.Logger;
@@ -18,6 +20,8 @@ namespace RestoreMonarchy.AnimalManager
     public class AnimalManagerPlugin : RocketPlugin<AnimalManagerConfiguration>
     {
         public static AnimalManagerPlugin Instance { get; private set; }
+
+        public static event Action<List<uint>> OnAnimalLootDropped;
         public Color MessageColor { get; private set; }
 
         public AnimalSpawnsXmlConfiguration AnimalSpawnsConfiguration { get; private set; }
@@ -39,7 +43,8 @@ protected override void Load()
             if (Level.isLoaded)
             {
                 OnPostLevelLoaded(0);
-            } else
+            }
+            else
             {
                 Level.onPostLevelLoaded += OnPostLevelLoaded;
             }
@@ -67,7 +72,7 @@ protected override void Unload()
             { "NoAnimalSpawnsFound", "No animal spawns found in radius of {0}." },
             { "AnimalSpawnRemoved", "Found and removed {0} animal spawns in {1}m radius." },
             { "AnimalsNone", "There isn't any alive animals on the map." },
-            { "AnimalsNoneSpecific", "There isn't any alive {0} animals on the map." },            
+            { "AnimalsNoneSpecific", "There isn't any alive {0} animals on the map." },
             { "AnimalTeleported", "You have been teleported to {0} animal." }
         };
 
@@ -80,13 +85,13 @@ internal void LogDebug(string message)
         }
 
         private void OnPostLevelLoaded(int level)
-        { 
+        {
             AnimalSpawnsConfiguration.Load();
             if (Configuration.Instance.CustomSpawns.Enabled)
             {
                 AnimalHelper.ResetAnimalManager();
                 AnimalSpawnService = gameObject.AddComponent<AnimalSpawnService>();
-            }            
+            }
         }
 
         public float GetRadius(AnimalSpawn animalSpawn)
@@ -109,6 +114,12 @@ public float GetRespawnTime(AnimalSpawn animalSpawn)
             return Configuration.Instance.CustomSpawns.DefaultRespawnTime;
         }
 
+        private static readonly FieldInfo InstanceCountField = typeof(ItemManager).GetField("instanceCount", BindingFlags.Static | BindingFlags.NonPublic);
+
+        /// <summary>
+        /// Handles custom loot dropping for animals.
+        /// </summary>
+        /// <returns>true if custom loot was dropped, false otherwise.</returns>
         public bool DropLoot(Animal animal)
         {
             AnimalConfig animalConfig = Configuration.Instance.GetAnimalById(animal.asset.id);
@@ -122,6 +133,8 @@ public bool DropLoot(Animal animal)
                 return false;
             }
 
+            uint startInstanceCount = (uint)InstanceCountField.GetValue(null);
+
             Vector3 position = animal.transform.position;
             foreach (LootItem lootItem in animalConfig.LootItems)
             {
@@ -140,7 +153,22 @@ public bool DropLoot(Animal animal)
                 }
             }
 
+            if (OnAnimalLootDropped != null)
+            {
+                uint endInstanceCount = (uint)InstanceCountField.GetValue(null);
+                List<uint> instanceIds = new();
+                for (uint i = startInstanceCount + 1; i <= endInstanceCount; i++)
+                {
+                    instanceIds.Add(i);
+                }
+
+                if (instanceIds.Count > 0)
+                {
+                    OnAnimalLootDropped.Invoke(instanceIds);
+                }
+            }
+
             return true;
         }
     }
-}
+}

AnimalManager/Patches/AnimalManagerPatches.cs

@@ -1,4 +1,4 @@
-using HarmonyLib;
+using HarmonyLib;
 using SDG.Unturned;
 
 namespace RestoreMonarchy.AnimalManager.Patches
@@ -12,7 +12,8 @@ static bool dropLoot_Prefix(Animal animal)
         {
             AnimalManagerPlugin pluginInstance = AnimalManagerPlugin.Instance;
 
-            return pluginInstance.DropLoot(animal);
+            // If custom loot was dropped, skip the original method
+            return !pluginInstance.DropLoot(animal);
         }
 
         [HarmonyPatch("respawnAnimals")]

README.md

@@ -1,6 +1,9 @@
 # Animal Manager
 Set up custom spawns points and modify the loot from animals.
 
+## Compatibility
+This plugin is compatible with [Zombie Loot Manager](https://restoremonarchy.com/plugins/150) - custom animal loot will be properly tracked for despawning.
+
 ## Features
 - Modify the loot dropped by animals on death
 - Set up custom spawn points for animals