From 5aae01986f506b160dbd5dc08aa7e6f3fec72342 Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sun, 29 May 2016 18:51:58 +0100 Subject: Revert "Merge pull request #16433 from Tonghost/3.3.5" This reverts commit e3d52990dd1e543baea6fed0c7e99359263e6452, reversing changes made to 6d8e39f59c80639de3681565f55d68d452223c87. Opens #16759 --- src/server/game/Entities/Creature/Creature.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 22e917448c3..a11f4131dcf 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -367,13 +367,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 -- cgit v1.2.3