aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index c052806c7e7..32094b774fa 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -542,9 +542,11 @@ bool Creature::InitEntry(uint32 entry, CreatureData const* data /*= nullptr*/)
SetNativeDisplayId(model.CreatureDisplayID, model.DisplayScale);
// Load creature equipment
- if (!data || data->equipmentId == 0)
- LoadEquipment(); // use default equipment (if available)
- else // override, 0 means no equipment
+ if (!data)
+ LoadEquipment(); // use default equipment (if available) for summons
+ else if (data->equipmentId == 0)
+ LoadEquipment(0); // 0 means no equipment for creature table
+ else
{
m_originalEquipmentId = data->equipmentId;
LoadEquipment(data->equipmentId);