From c79a31dfff7f3cfef4d9faab1ea2856775473bad Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 31 Aug 2019 15:25:49 -0400 Subject: [PATCH] Core/Entities: spawned movementtype should override template movementtype Port From (https://github.com/TrinityCore/TrinityCore/commit/a24cb8a057d53c4df15b97e536c14640d9d08610) --- Source/Game/AI/SmartScripts/SmartScript.cs | 2 +- Source/Game/Entities/Creature/Creature.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/AI/SmartScripts/SmartScript.cs b/Source/Game/AI/SmartScripts/SmartScript.cs index 851592001..c2604b308 100644 --- a/Source/Game/AI/SmartScripts/SmartScript.cs +++ b/Source/Game/AI/SmartScripts/SmartScript.cs @@ -1031,7 +1031,7 @@ namespace Game.AI foreach (var obj in targets) if (IsCreature(obj)) - obj.ToCreature().UpdateEntry(e.Action.updateTemplate.creature, null, e.Action.updateTemplate.updateLevel != 0); + obj.ToCreature().UpdateEntry(e.Action.updateTemplate.creature, obj.ToCreature().GetCreatureData(), e.Action.updateTemplate.updateLevel != 0); break; } case SmartActions.Die: diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index 02fae2aa3..db82597c1 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -255,7 +255,7 @@ namespace Game.Entities SetHoverHeight(cinfo.HoverHeight); // checked at loading - m_defaultMovementType = (MovementGeneratorType)cinfo.MovementType; + m_defaultMovementType = (MovementGeneratorType)(data != null ? data.movementType : cinfo.MovementType); if (m_respawnradius == 0 && m_defaultMovementType == MovementGeneratorType.Random) m_defaultMovementType = MovementGeneratorType.Idle;