Core/Creature: equipment_id field on creature table is not working correctly, if it's set to 0 the npc still spawn with the equipement. (#23273)

By Malcrom
Closes #16416
This commit is contained in:
Aokromes
2019-05-15 23:12:38 +02:00
committed by Killyana
parent 99fbaa2be2
commit 61ba477c77

View File

@@ -489,9 +489,11 @@ bool Creature::InitEntry(uint32 entry, CreatureData const* data /*= nullptr*/)
SetNativeDisplayId(displayID);
// 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);