Core/Creatures: Only remove formation movement on formation remove instead of fully resetting MotionMaster

Port From (https://github.com/TrinityCore/TrinityCore/commit/67dd9a920fdabb26e6429432885345b1a1771b9a)
2024-09-01 15:26:19 -04:00
parent 762c26f16e
commit 530e8dbd36
2 changed files with 5 additions and 4 deletions
@@ -1067,12 +1067,13 @@ namespace Game.Entities
                    return;
                }

-                if (vehicle.GetBase().IsCreature())
+                Creature vehicleBaseCreature = vehicle.GetBase().ToCreature();
+                if (vehicleBaseCreature != null)
                {
                    // If a player entered a vehicle that is part of a formation, remove it from said formation
-                    CreatureGroup creatureGroup = vehicle.GetBase().ToCreature().GetFormation();
+                    CreatureGroup creatureGroup = vehicleBaseCreature.GetFormation();
                    if (creatureGroup != null)
-                        creatureGroup.RemoveMember(vehicle.GetBase().ToCreature());
+                        FormationMgr.RemoveCreatureFromGroup(creatureGroup, vehicleBaseCreature);
                }
            }