Merge 3.3.5 to 3.3.5-base_patch

Author: Github Actions

src/server/game/Entities/Creature/CreatureGroups.cpp

@@ -259,18 +259,21 @@ void CreatureGroup::MemberEngagingTarget(Creature* member, Unit* target)
     _engaging = false;
 }
 
-void CreatureGroup::FormationReset(bool /*dismiss*/)
+void CreatureGroup::FormationReset(bool dismiss)
 {
     for (auto const& pair : _members)
     {
         if (pair.first != _leader && pair.first->IsAlive())
         {
-            pair.first->GetMotionMaster()->MoveIdle();
-            // TC_LOG_DEBUG("entities.unit", "CreatureGroup::FormationReset: Set {} movement for member {}", dismiss ? "default" : "idle", pair.first->GetGUID().ToString());
+            if (dismiss)
+                pair.first->GetMotionMaster()->Remove(FORMATION_MOTION_TYPE, MOTION_SLOT_DEFAULT);
+            else
+                pair.first->GetMotionMaster()->MoveIdle();
+            TC_LOG_DEBUG("entities.unit", "CreatureGroup::FormationReset: Set {} movement for member {}", dismiss ? "default" : "idle", pair.first->GetGUID().ToString());
         }
     }
 
-    // _formed = !dismiss;
+    _formed = !dismiss;
 }
 
 void CreatureGroup::LeaderStartedMoving()

src/server/game/Entities/Unit/Unit.cpp

@@ -12637,11 +12637,11 @@ void Unit::_EnterVehicle(Vehicle* vehicle, int8 seatId, AuraApplication const* a
             return;
         }
 
-        if (vehicle->GetBase()->GetTypeId() == TYPEID_UNIT)
+        if (Creature* vehicleBaseCreature = vehicle->GetBase()->ToCreature())
         {
             // If a player entered a vehicle that is part of a formation, remove it from said formation
-            if (CreatureGroup* creatureGroup = vehicle->GetBase()->ToCreature()->GetFormation())
-                creatureGroup->RemoveMember(vehicle->GetBase()->ToCreature());
+            if (CreatureGroup* creatureGroup = vehicleBaseCreature->GetFormation())
+                sFormationMgr->RemoveCreatureFromGroup(creatureGroup, vehicleBaseCreature);
         }
     }
 

src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp

@@ -114,8 +114,8 @@ struct npc_cameron : public ScriptedAI
         // first we break formation because children will need to move on their own now
         for (auto guid : _childrenGUIDs)
             if (Creature* child = ObjectAccessor::GetCreature(*me, guid))
-                if (child->GetFormation())
-                    child->GetFormation()->RemoveMember(child);
+                if (CreatureGroup* creatureGroup = child->GetFormation())
+                    sFormationMgr->RemoveCreatureFromGroup(creatureGroup, child);
 
         // Move each child to an random position
         for (uint32 i = 0; i < _childrenGUIDs.size(); ++i)