Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-02 23:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source 
By Malcrom
Closes #16416

(cherry picked from commit 61ba477c77)
This commit is contained in:
Aokromes
2019-05-15 23:12:38 +02:00
committed by Shauren
parent 1f0801ae3d
commit 1d22ade73f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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