Creature: Fix CreatureStaticFlags::CAN_WIELD_LOOT

cmangos · Dec 27, 2024 · b7c2611 · b7c2611
1 parent 76b59c1
commit b7c2611
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
@@ -425,10 +425,10 @@ bool Creature::InitEntry(uint32 Entry, CreatureData const* data /*=nullptr*/, Ga
                     SetVirtualItem(VIRTUAL_ITEM_SLOT_0, mh);
 
                 if (oh != 0)
-                    SetVirtualItem(VIRTUAL_ITEM_SLOT_0, oh);
+                    SetVirtualItem(VIRTUAL_ITEM_SLOT_1, oh);
 
                 if (ranged != 0)
-                    SetVirtualItem(VIRTUAL_ITEM_SLOT_0, ranged);
+                    SetVirtualItem(VIRTUAL_ITEM_SLOT_2, ranged);
             }            
         }
     }

diff --git a/src/game/Loot/LootMgr.cpp b/src/game/Loot/LootMgr.cpp
@@ -1666,16 +1666,16 @@ Loot::Loot(Player* player, Creature* creature, LootType type) :
     m_clientLootType(CLIENT_LOOT_CORPSE), m_lootMethod(NOT_GROUP_TYPE_LOOT), m_threshold(ITEM_QUALITY_UNCOMMON), m_maxEnchantSkill(0), m_haveItemOverThreshold(false),
     m_isChecked(false), m_isChest(false), m_isChanged(false), m_isFakeLoot(false), m_createTime(World::GetCurrentClockTime())
 {
-    // the player whose group may loot the corpse
-    if (!player)
+    if (!creature)
     {
-        sLog.outError("LootMgr::CreateLoot> Error cannot get looter info to create loot!");
+        sLog.outError("Loot::CreateLoot> cannot create loot, no creature passed!");
         return;
     }
 
-    if (!creature)
+    // the player whose group may loot the corpse
+    if (!player && !creature->GetSettings().HasFlag(CreatureStaticFlags::CAN_WIELD_LOOT))
     {
-        sLog.outError("Loot::CreateLoot> cannot create loot, no creature passed!");
+        sLog.outError("LootMgr::CreateLoot> Error cannot get looter info to create loot!");
         return;
     }
 
@@ -1693,7 +1693,7 @@ Loot::Loot(Player* player, Creature* creature, LootType type) :
                     if (threatEntry->getTarget()->IsPlayer())
                         m_ownerSet.insert(threatEntry->getTarget()->GetObjectGuid());
             }
-            else
+            else if (player)
                 // setting loot right
                 SetGroupLootRight(player);
             m_clientLootType = CLIENT_LOOT_CORPSE;