From 73c422eedd733b271b3cab1b242f839f54afa5b0 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sun, 1 Sep 2019 10:58:29 -0400
Subject: [PATCH] Core/Creature: don't override display id if addon tables load
 a morph aura

Port From (https://github.com/TrinityCore/TrinityCore/commit/5f2790815a7eadd0e1781488a4d4442f1dc08228)
---
 Source/Game/Entities/Creature/Creature.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index c90b8113e..cba6e9989 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -820,9 +820,12 @@ namespace Game.Entities
             CreatureModelInfo minfo = Global.ObjectMgr.GetCreatureModelRandomGender(ref display, cinfo);
             if (minfo != null && !IsTotem())                               // Cancel load if no model defined or if totem
             {
-                SetDisplayId(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();