Core/Creature: Do not load equipment with id = 1 when creature.equipment_id is 0

Closes #16416

(cherry picked from commit cc3ae640a48417aae31eac8828842ab50099069b)

src/server/game/Entities/Creature/Creature.cpp

@@ -370,13 +370,13 @@ bool Creature::InitEntry(uint32 entry, CreatureData const* data /*= nullptr*/)
     SetByteValue(UNIT_FIELD_BYTES_0, UNIT_BYTES_0_OFFSET_GENDER, minfo->gender);
 
     // Load creature equipment
-    if (!data || data->equipmentId == 0)
-        LoadEquipment(); // use default equipment (if available)
-    else if (data && data->equipmentId != 0)                // override, 0 means no equipment
+    if (data && data->equipmentId != 0)
     {
         m_originalEquipmentId = data->equipmentId;
         LoadEquipment(data->equipmentId);
     }
+    else
+        LoadEquipment(0, true);
 
     SetName(normalInfo->Name);                              // at normal entry always
 
@@ -1436,6 +1436,7 @@ void Creature::LoadEquipment(int8 id, bool force /*= true*/)
                 SetVirtualItem(i, 0);
             m_equipmentId = 0;
         }
+
         return;
     }
 

src/server/game/Globals/ObjectMgr.cpp

@@ -1803,7 +1803,7 @@ void ObjectMgr::LoadCreatures()
         if (!ok)
             continue;
 
-        // -1 random, 0 no equipment,
+        // -1 random, 0 no equipment
         if (data.equipmentId != 0)
         {
             if (!GetEquipmentInfo(data.id, data.equipmentId))