Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Creature: don't override display id if addon tables load a morph aura

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/5f2790815a7eadd0e1781488a4d4442f1dc08228)
This commit is contained in:
hondacrx
2019-09-01 10:58:29 -04:00
parent f281d5f121
commit 73c422eedd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Creature.cs
+5 -2
View File
@@ -820,9 +820,12 @@ namespace Game.Entities
CreatureModelInfo minfo = Global.ObjectMgr.GetCreatureModelRandomGender(ref display, cinfo); CreatureModelInfo minfo = Global.ObjectMgr.GetCreatureModelRandomGender(ref display, cinfo);
if (minfo != null && !IsTotem()) // Cancel load if no model defined or if totem if (minfo != null && !IsTotem()) // Cancel load if no model defined or if totem
{ {
SetDisplayId(display.CreatureDisplayID, display.DisplayScale);
SetNativeDisplayId(display.CreatureDisplayID, display.DisplayScale); SetNativeDisplayId(display.CreatureDisplayID, display.DisplayScale);
SetGender((Gender)minfo.gender);
var transformAuras = GetAuraEffectsByType(AuraType.Transform);
var shapeshiftAuras = GetAuraEffectsByType(AuraType.ModShapeshift);
if (transformAuras.Empty() && shapeshiftAuras.Empty())
SetDisplayId(display.CreatureDisplayID, display.DisplayScale);
} }
LastUsedScriptID = GetScriptId(); LastUsedScriptID = GetScriptId();