diff options
| author | Incorrect <ovitnez@gmail.com> | 2016-01-30 11:40:24 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-02 19:32:03 +0200 |
| commit | f8d5031fca9a639d61e66f0122e1491d43e6fe44 (patch) | |
| tree | ea6d1d92c4b62927b5710bcb55185081b82f07a1 /src | |
| parent | 7031090dc3cfa727dff50c2739ed9ee7dc0f352a (diff) | |
Core/Creature: Do not load equipment with id = 1 when creature.equipment_id is 0
Closes #16416
(cherry picked from commit cc3ae640a48417aae31eac8828842ab50099069b)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index a59f44b66e0..ecbb23e6863 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/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; } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 48e694b80c7..a4ebb1d565c 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/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)) |