diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2016-05-29 18:51:58 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-01-09 21:50:49 +0100 |
| commit | 0c511397a495f73655a81c7b22a013360a0f9add (patch) | |
| tree | 8ecd364f8c96b601fd88c223295731c7aab5cc90 | |
| parent | 7c42e426b2fcb0149866edccab3337253c86f3ce (diff) | |
Revert "Merge pull request #16433 from Tonghost/3.3.5"
This reverts commit e3d52990dd1e543baea6fed0c7e99359263e6452, reversing
changes made to 6d8e39f59c80639de3681565f55d68d452223c87.
Opens #16759
(cherry picked from commit 5aae01986f506b160dbd5dc08aa7e6f3fec72342)
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 5359409d8e2..c67780b8575 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -368,13 +368,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) + if (!data || data->equipmentId == 0) + LoadEquipment(); // use default equipment (if available) + else if (data && data->equipmentId != 0) // override, 0 means no equipment { m_originalEquipmentId = data->equipmentId; LoadEquipment(data->equipmentId); } - else - LoadEquipment(0, true); SetName(normalInfo->Name); // at normal entry always |