Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #16433 from Tonghost/3.3.5"

Browse Source 
This reverts commit e3d5299, reversing
changes made to 6d8e39f.
This commit is contained in:
Aokromes
2016-07-20 14:39:58 +02:00
parent 20ac85954b
commit 7cc54c08bb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -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