Merge pull request #109 from AlexBond2/spawn

Add ItemSpec for SpawnSpec.Spawn
Crypto137 · Jan 12, 2025 · 6da94a1 · 6da94a1
2 parents e9fb788 + ba4ee0b
commit 6da94a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/MHServerEmu.Games/Loot/LootManager.cs b/src/MHServerEmu.Games/Loot/LootManager.cs
@@ -488,7 +488,7 @@ public ItemSpec CreateItemSpec(PrototypeId itemProtoRef, LootContext lootContext
 
             _resolver.SetContext(lootContext, player);
 
-            AvatarPrototype avatarProto = player.CurrentAvatar?.AvatarPrototype;
+            AvatarPrototype avatarProto = player?.CurrentAvatar?.AvatarPrototype;
 
             using DropFilterArguments filterArgs = ObjectPoolManager.Instance.Get<DropFilterArguments>();
             filterArgs.ItemProto = itemProto;

diff --git a/src/MHServerEmu.Games/Populations/SpawnSpec.cs b/src/MHServerEmu.Games/Populations/SpawnSpec.cs
@@ -137,6 +137,9 @@ public bool Spawn()
             settings.SpawnSpec = this;
             settings.IsPopulation = true;
 
+            if (entityProto is ItemPrototype)
+                settings.ItemSpec = Game.LootManager.CreateItemSpec(EntityRef, LootContext.CashShop, null);
+
             ActiveEntity = manager.CreateEntity(settings) as WorldEntity;
 
             var twinBoost = GameDatabase.PopulationGlobalsPrototype.TwinEnemyBoost;