*CreatureGroups fixed and improoved. By TrullyONE

- Multimap support for instances added.
 - Removed redundant group checks.
 - New movement rules (bool group formed/dismissed added).
 - uint32 Creature::GroupID replaced with CreatureGroup pointer.

--HG--
branch : trunk

src/game/Creature.cpp

@@ -139,7 +139,7 @@ m_deathTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_resp
 m_gossipOptionLoaded(false), m_emoteState(0),
 m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(0), m_AlreadyCallAssistance(false),
 m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false), m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL),
-m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formationID(0), m_summonMask(SUMMON_MASK_NONE)
+m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formation(NULL), m_summonMask(SUMMON_MASK_NONE)
 {
     m_regenTimer = 200;
     m_valuesCount = UNIT_END;
@@ -181,11 +181,17 @@ void Creature::AddToWorld()
 
 void Creature::RemoveFromWorld()
 {
-    ///- Remove the creature from the accessor
+    
+	// Clear formation info
+	if(m_formation)
+	{
+		formation_mgr.DestroyGroup(m_formation, GetGUID());
+		m_formation = NULL;
+	}
+	
+	///- Remove the creature from the accessor
     if(IsInWorld())
     {
-        if(m_formationID)
-            formation_mgr.DestroyGroup(m_formationID, GetGUID());
         Unit::RemoveFromWorld();
         ObjectAccessor::Instance().RemoveObject(this);
     }
@@ -197,11 +203,14 @@ void Creature::SearchFormation()
         return;
 
     uint32 lowguid = GetDBTableGUIDLow();
+    if(!lowguid)
+        return;
 
-    if(lowguid && CreatureGroupMap.find(lowguid) != CreatureGroupMap.end())
+    UNORDERED_MAP<uint32, FormationMember *>::iterator frmdata = CreatureGroupMap.find(lowguid);
+    if(frmdata != CreatureGroupMap.end())
     {
-        m_formationID = CreatureGroupMap[lowguid]->leaderGUID;
-        formation_mgr.UpdateCreatureGroup(m_formationID, this);
+        uint32 formationID = frmdata->second->leaderGUID;
+        formation_mgr.UpdateCreatureGroup(formationID, *this);
     }
 }
 
@@ -611,7 +620,17 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
     }
 
     UnitAI *oldAI = i_AI;
-    i_motionMaster.Initialize();
+    
+	if(!m_formation)
+		i_motionMaster.Initialize();
+	else if(m_formation->getLeader() == this)
+	{	
+		m_formation->FormDismiss();
+		i_motionMaster.Initialize();
+	}
+	else
+		m_formation->isFormed() ? i_motionMaster.MoveIdle(MOTION_SLOT_IDLE) : i_motionMaster.Initialize();
+	
     i_AI = ai ? ai : FactorySelector::selectAI(this);
     if(oldAI) delete oldAI;
     IsAIEnabled = true;
@@ -1654,7 +1673,11 @@ void Creature::setDeathState(DeathState s)
             return;
 
         Unit::setDeathState(CORPSE);
-    }
+    
+		//Dismiss group if is leader
+		if(m_formation && m_formation->getLeader() == this)
+			m_formation->FormDismiss(true);
+	}
     if(s == JUST_ALIVED)
     {
         //if(isPet())
@@ -1667,10 +1690,23 @@ void Creature::setDeathState(DeathState s)
         AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
         SetUInt32Value(UNIT_NPC_FLAGS, cinfo->npcflag);
         clearUnitState(UNIT_STAT_ALL_STATE);
-        i_motionMaster.Initialize();
+        //i_motionMaster.Initialize();
         SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool));
         LoadCreaturesAddon(true);
-    }
+		/////////////////////!!!!!!!!!!!!!!!!!!!!
+		if(!m_formation)
+			i_motionMaster.Initialize();
+		else
+		{
+			if(m_formation->getLeader() == this)
+			{	
+				m_formation->FormDismiss(false);
+				i_motionMaster.Initialize();
+			}
+			else 
+				m_formation->isFormed() ? i_motionMaster.MoveIdle(MOTION_SLOT_IDLE) : i_motionMaster.Initialize();
+		}
+	}
 }
 
 bool Creature::FallGround()

src/game/Creature.h

@@ -651,8 +651,8 @@ class TRINITY_DLL_SPEC Creature : public Unit
         void UpdateWaypointID(uint32 wpID){m_waypointID = wpID;}
 
         void SearchFormation();
-        bool IsFormationLeader() {return (GetDBTableGUIDLow() && GetDBTableGUIDLow() == m_formationID);}
-        uint32 GetFormationID(){return m_formationID;}
+		CreatureGroup *GetFormation() {return m_formation;}
+		void SetFormation(CreatureGroup *formation) {m_formation = formation;}
 
         Unit *SelectVictim();
         void SetDeadByDefault (bool death_state) {m_isDeadByDefault = death_state;}
@@ -711,7 +711,7 @@ class TRINITY_DLL_SPEC Creature : public Unit
         uint32 m_path_id;
 
         //Formation var
-        uint32 m_formationID;
+        CreatureGroup *m_formation;
 
         GridReference<Creature> m_gridRef;
         CreatureInfo const* m_creatureInfo;                 // in heroic mode can different from ObjMgr::GetCreatureTemplate(GetEntry())

src/game/CreatureGroups.cpp

@@ -25,40 +25,60 @@
 #include "Policies/SingletonImp.h"
 
 #define MAX_DESYNC 5.0f
-//TODO: Create group manager for each map
+
 INSTANTIATE_SINGLETON_1(CreatureGroupManager);
 
-UNORDERED_MAP<uint32, CreatureGroup*> CreatureGroupHolder;
+CreatureGroupHolderType CreatureGroupHolder;
 UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
 
-void CreatureGroupManager::UpdateCreatureGroup(uint32 group_id, Creature *member)
+void CreatureGroupManager::UpdateCreatureGroup(uint32 group_id, Creature &member)
 {
-    if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end())
+    std::multimap<uint32, CreatureGroup *>::iterator cgroup_data = CreatureGroupHolder.find(group_id);
+
+    if(cgroup_data != CreatureGroupHolder.end())
     {
-        sLog.outDebug("Group found: %u, inserting creature GUID: %u", group_id, member->GetGUIDLow());
-        CreatureGroupHolder[group_id]->AddMember(member);
-    }
-    else
-    {
-        sLog.outDebug("Group not found: %u. Creating new group.", group_id);
-        CreatureGroup* formation = new CreatureGroup;
-        CreatureGroupHolder[group_id] = formation;
-        formation->AddMember(member);
+        typedef std::multimap<uint32, CreatureGroup *>::iterator multiplegroup;
+        std::pair<multiplegroup, multiplegroup> range = CreatureGroupHolder.equal_range(group_id);
+
+        for(multiplegroup i = range.first; i != range.second; ++i)
+        {
+            if(i->second->getInstanceID() == member.GetInstanceId())
+            {
+                sLog.outDebug("Group found: %u, inserting creature GUID: %u, Group InstanceID %u", group_id, member.GetGUIDLow(), i->second->getInstanceID());
+                i->second->AddMember(member);
+                return;
+            }
+        }
     }
+
+    sLog.outDebug("Group not found: %u. Creating new group.", group_id);
+    CreatureGroup* cgroup = new CreatureGroup(group_id, member.GetInstanceId());
+    cgroup->AddMember(member);
+    CreatureGroupHolder.insert(std::make_pair(group_id, cgroup));
 }
 
-void CreatureGroupManager::DestroyGroup(uint32 group_id, uint64 guid)
+void CreatureGroupManager::DestroyGroup(CreatureGroup *&formation, uint64 guid)
 {
-    if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end())
-    {
-        sLog.outDebug("Deleting member pointer to GUID: %u from group %u", group_id, guid);
-        CreatureGroupHolder[group_id]->RemoveMember(guid);
+    if(!formation || !guid)
+        return;
 
-        if(CreatureGroupHolder[group_id]->isEmpty())
+    sLog.outDebug("Deleting member pointer to GUID: %u from group %u", formation->GetId(), guid);
+    formation->RemoveMember(guid);
+
+    if(formation->isEmpty())
+    {
+        uint32 id = formation->GetId();
+        typedef std::multimap<uint32, CreatureGroup *>::iterator multiplegroup;
+        std::pair<multiplegroup, multiplegroup> range = CreatureGroupHolder.equal_range(id);
+
+        for(multiplegroup i = range.first; i != range.second; ++i)
         {
-            sLog.outDebug("Deleting group %u", group_id);
-            delete CreatureGroupHolder[group_id];
-            CreatureGroupHolder.erase(group_id);
+            if(i->second == formation)
+            {
+                sLog.outDebug("Deleting group with InstanceID %u", i->second->getInstanceID());
+                CreatureGroupHolder.erase(i);
+                delete formation;
+            }
         }
     }
 }
@@ -73,7 +93,7 @@ void CreatureGroupManager::LoadCreatureFormations()
 
     if(!result)
     {
-        sLog.outErrorDb(" an error occured while loading the table `creature_formations` ( maybe it doesn't exist ?)\n");
+        sLog.outErrorDb(" ...an error occured while loading the table `creature_formations` ( maybe it doesn't exist ?)\n");
         return;
     }
     delete result;
@@ -87,7 +107,7 @@ void CreatureGroupManager::LoadCreatureFormations()
         return;
     }
 
-    uint32 total_records = result->GetRowCount();
+    uint32 total_records = result->GetRowCount(), lastLeaderGUID = 0;
     barGoLink bar( total_records);
     Field *fields;
 
@@ -99,36 +119,22 @@ void CreatureGroupManager::LoadCreatureFormations()
 
         bar.step();
         //Load group member data
-        group_member                        = new FormationMember;
-        group_member->leaderGUID            = fields[0].GetUInt32();
-        group_member->memberGUID            = fields[1].GetUInt32();
-        group_member->groupAI               = fields[4].GetUInt8();
+        group_member						= new FormationMember;
+        group_member->leaderGUID			= fields[0].GetUInt32();
+        group_member->memberGUID			= fields[1].GetUInt32();
+        group_member->groupAI				= fields[4].GetUInt8();
         //If creature is group leader we may skip loading of dist/angle
         if(group_member->leaderGUID != group_member->memberGUID)
         {
-            group_member->follow_dist           = fields[2].GetUInt32();
-            group_member->follow_angle          = fields[3].GetUInt32();
-        }
-
-        // check data correctness
-        {
-            QueryResult* result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", group_member->leaderGUID);
-            if(!result)
-            {
-                sLog.outErrorDb("creature_formations table leader guid %u incorrect (not exist)", group_member->leaderGUID);
-                continue;
-            }
-
-            result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", group_member->memberGUID);
-            if(!result)
-            {
-                sLog.outErrorDb("creature_formations table member guid %u incorrect (not exist)", group_member->memberGUID);
-                continue;
-            }
+            group_member->follow_dist			= fields[2].GetUInt32();
+            group_member->follow_angle			= fields[3].GetUInt32();
         }
 
         CreatureGroupMap[group_member->memberGUID] = group_member;
-    }
+
+        if(lastLeaderGUID != group_member->leaderGUID)
+            lastLeaderGUID = group_member->leaderGUID;
+    } 
     while(result->NextRow()) ;
 
     sLog.outString();
@@ -138,92 +144,123 @@ void CreatureGroupManager::LoadCreatureFormations()
     delete result;
 }
 
-void CreatureGroup::AddMember(Creature *member)
+void CreatureGroup::AddMember(Creature &member)
 {
-    sLog.outDebug("Adding unit GUID: %u.", member->GetGUIDLow());
+    sLog.outDebug("Adding unit GUID: %u.", member.GetGUIDLow());
 
-    uint64 guid = member->GetGUID();
+    uint64 guid = member.GetGUID();
     //We first search creature member if exist
     if(CreatureGroupMembers.find(guid) != CreatureGroupMembers.end())
         return;
     //Check is that shit is a leader
-    if(member->IsFormationLeader())
-    {
-        sLog.outDebug("Unit GUID: %u is formation leader. Adding group.", member->GetGUIDLow());
-        m_leader = member;
+    if(member.GetDBTableGUIDLow()==m_groupID)
+    {	
+        sLog.outDebug("Unit GUID: %u is formation leader. Adding group.", member.GetGUIDLow());
+        m_leader = &member;
+    }
+    else
+    {	
+        sLog.outDebug("Unit GUID: %u is NOT a formation leader. Set IDLE as default movement.", member.GetGUIDLow());
+        member.GetMotionMaster()->MoveIdle(MOTION_SLOT_IDLE);
     }
     //Add to the club
-    CreatureGroupMembers[guid] = member;
-    sLog.outDebug("Unit GUID: %u added.", member->GetGUID());
+    CreatureGroupMembers[guid] = &member;
+    member.SetFormation(this);
+    sLog.outDebug("Unit GUID: %u added.", member.GetGUID());
 }
 
 void CreatureGroup::RemoveMember(uint64 guid)
 {
     if(CreatureGroupMembers.find(guid) != CreatureGroupMembers.end())
-        CreatureGroupMembers.erase(guid);
+        CreatureGroupMembers.erase(guid);	
 }
 
-void CreatureGroup::MemberHasAttacked(Creature *member)
+void CreatureGroup::MemberHasAttacked(Creature &member)
 {
-    uint8 groupAI = CreatureGroupMap[member->GetDBTableGUIDLow()]->groupAI;;
+    uint8 groupAI = CreatureGroupMap[member.GetDBTableGUIDLow()]->groupAI;
 
-    for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); itr++)
+    for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); ++itr)
     {
-        sLog.outDebug("AI:%u:Group member found: %u, attacked by %s.", groupAI, itr->second->GetGUIDLow(), member->getVictim()->GetName());
+        sLog.outDebug("GROUP ATTACK: group instance id %u calls member instid %u", m_leader->GetInstanceId(), member.GetInstanceId());
+        //sLog.outDebug("AI:%u:Group member found: %u, attacked by %s.", groupAI, itr->second->GetGUIDLow(), member.getVictim()->GetName());
+
         if(itr->second)
         {
+            //Skip one check
+            if(itr->second == &member)
+                return;
+
             switch(groupAI)
             {
-                case 0:
+            case 0:
+                return;
+            case 1:
+                if(&member != m_leader)
                     return;
-                case 1:
-                    if(!member->IsFormationLeader())
-                        return;
-            }
+            }	
             //Attack if everything is OK
-            itr->second->AI()->AttackStart(member->getVictim());
+            if(itr->second->isAlive() && itr->second->AI() && !itr->second->isInCombat() && 
+                !itr->second->getVictim() && member.getVictim() && itr->second->canAttack(member.getVictim()))
+                itr->second->AI()->AttackStart(member.getVictim());	
         }
     }
 }
 
 void CreatureGroup::LeaderMovedInEvade()
 {
-    for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); itr++)
+    for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); ++itr)
     {
-        if(itr->second && itr->second->isAlive() && !itr->second->isInCombat() && !itr->second->getVictim())
-            SetMemberDestination(itr->second);
+        if(itr->second && itr->second != m_leader && itr->second->isAlive() && !itr->second->isInCombat() && !itr->second->getVictim())
+        {
+            SetMemberDestination(itr->second);		
+            sLog.outDebug("GROUP MOVE IN EVADE: Set destination for member GUID %u", itr->second->GetGUIDLow());
+        }
     }
 }
 
+void CreatureGroup::FormDismiss(bool dismiss)
+{
+    for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); ++itr)
+    {
+        if(itr->second && itr->second != m_leader && itr->second->isAlive())
+        {
+            dismiss ? itr->second->GetMotionMaster()->Initialize() : itr->second->GetMotionMaster()->MoveIdle(MOTION_SLOT_IDLE);
+            sLog.outDebug("Set %s movement for member GUID: %u", dismiss ? "default" : "idle", itr->second->GetGUIDLow());
+        }
+    }
+    m_Formed = !dismiss;
+}
+
 void CreatureGroup::SetMemberDestination(Creature *member)
 {
-    if(!member || !m_leader || member->IsFormationLeader())
+    if(!member || !m_leader || !member->isAlive() || member->isInCombat() || member->getVictim())
         return;
 
+    sLog.outDebug("GROUP MOVE IN EVADE: leader instid %u set destination of member instid %u", m_leader->GetInstanceId(), member->GetInstanceId());
+
     float x,y,z;
     uint32 lowguid = member->GetDBTableGUIDLow();
 
     UNORDERED_MAP<uint32, FormationMember*>::iterator itr2 = CreatureGroupMap.find(lowguid);
 
-    if(m_leader->GetMotionMaster()->GetDestination(x,y,z) && itr2 != CreatureGroupMap.end())
-    {
+    if(itr2 != CreatureGroupMap.end() && m_leader->GetMotionMaster()->GetDestination(x,y,z))
+    {	
         float dist, angle, pathangle;
 
-        angle       = CreatureGroupMap[lowguid]->follow_angle;
-        dist        = CreatureGroupMap[lowguid]->follow_dist;
-        pathangle   = atan2(m_leader->GetPositionY()-y, m_leader->GetPositionX()-x);
+        angle		= itr2->second->follow_angle;	
+        dist		= itr2->second->follow_dist;	
+        pathangle	= atan2(m_leader->GetPositionY()-y, m_leader->GetPositionX()-x);
 
         x = x+cos(angle+pathangle)*dist;
         y = y+sin(angle+pathangle)*dist;
 
-        member->GetMotionMaster()->Clear();
-
         if(member->GetDistance(m_leader) < dist+MAX_DESYNC)
             member->SetUnitMovementFlags(m_leader->GetUnitMovementFlags());
         else
             member->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
 
+        member->GetMotionMaster()->Clear();
         member->GetMotionMaster()->MovePoint(0, x, y, z);
+        member->SetHomePosition(x, y, z, pathangle);
     }
 }
-

src/game/CreatureGroups.h

@@ -1,7 +1,7 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
+/* 
+ * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
  *
- * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
+ * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,44 +21,56 @@
 #ifndef _FORMATIONS_H
 #define _FORMATIONS_H
 
-#include <map>
-#include "Creature.h"
-#include "Policies/Singleton.h"
+//#include <map>
+//#include "Creature.h"
+//#include "Policies/Singleton.h"
+#include "Common.h"
+
+class CreatureGroup;
 
 struct FormationMember
 {
-    float follow_dist;
-    float follow_angle;
-    uint32 memberGUID;
-    uint32 leaderGUID;
-    uint8 groupAI;
+	float follow_dist; 
+	float follow_angle; 
+	uint32 memberGUID; 
+	uint32 leaderGUID;
+	uint8 groupAI;
 };
 
 class CreatureGroupManager
 {
-    public:
-        void UpdateCreatureGroup(uint32 group_id, Creature *member);
-        void DestroyGroup(uint32 group_id, uint64 guid);
-        void LoadCreatureFormations();
+	public:
+        void UpdateCreatureGroup(uint32 group_id, Creature &);
+        void DestroyGroup(CreatureGroup *&, uint64 guid);
+		void LoadCreatureFormations();
 };
 
 class CreatureGroup
 {
-    UNORDERED_MAP<uint64, Creature*>CreatureGroupMembers;
-    Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
-
-    public:
-        CreatureGroup() : m_leader(NULL) {}
-        ~CreatureGroup(){sLog.outDebug("Destroying group");}
-        void AddMember(Creature *);
-        void RemoveMember(uint64 guid);
-        void LeaderMovedInEvade();
-        void MemberHasAttacked(Creature *);
-        void SetMemberDestination(Creature *);
-        bool isEmpty() {return CreatureGroupMembers.empty();}
+	UNORDERED_MAP<uint64, Creature*>CreatureGroupMembers;
+	Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
+	uint32 m_groupID, mInstanceID;
+	bool m_Formed;
+	
+	public:
+        //Group cannot be created empty
+		explicit CreatureGroup(uint32 id, uint32 InstanceID) : m_groupID(id), m_leader(NULL), mInstanceID(InstanceID), m_Formed(false) {}
+		~CreatureGroup(){sLog.outDebug("Destroying group");}
+		
+		Creature* getLeader(){return m_leader;}
+		uint32 GetId(){return m_groupID;}
+		uint32 getInstanceID(){return mInstanceID;}
+		void AddMember(Creature &);
+		void RemoveMember(uint64 guid);
+		void FormDismiss(bool dismiss=false);
+		void LeaderMovedInEvade();
+		void MemberHasAttacked(Creature &);
+		void SetMemberDestination(Creature *);
+		bool isEmpty() {return CreatureGroupMembers.empty();}
+		bool isFormed() {return m_Formed;}
 };
 
-typedef UNORDERED_MAP<uint32, CreatureGroup*> CreatureGroupHolderType;
+typedef std::multimap<uint32, CreatureGroup*> CreatureGroupHolderType;
 
 extern CreatureGroupHolderType CreatureGroupHolder;
 extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
@@ -66,4 +78,3 @@ extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
 #define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()
 
 #endif
-

src/game/HomeMovementGenerator.cpp

@@ -69,7 +69,8 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff
         // restore orientation of not moving creature at returning to home
         if(owner.GetDefaultMovementType()==IDLE_MOTION_TYPE)
         {
-            owner.SetOrientation(ori);
+            sLog.outDebug("Entering HomeMovement::GetDestination(z,y,z)");
+			owner.SetOrientation(ori);
             WorldPacket packet;
             owner.BuildHeartBeatMsg(&packet);
             owner.SendMessageToSet(&packet, false);

src/game/HomeMovementGenerator.h

@@ -47,7 +47,8 @@ class TRINITY_DLL_SPEC HomeMovementGenerator<Creature>
         MovementGeneratorType GetMovementGeneratorType() { return HOME_MOTION_TYPE; }
 
         bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; }
-    private:
+    
+	private:
         void _setTargetLocation(Creature &);
         DestinationHolder< Traveller<Creature> > i_destinationHolder;
 

src/game/Level2.cpp

@@ -4569,9 +4569,9 @@ bool ChatHandler::HandleNpcAddFormationCommand(const char* args)
     }
 
     uint32 lowguid = pCreature->GetDBTableGUIDLow();
-    if(pCreature->GetFormationID())
+	if(pCreature->GetFormation())
     {
-        PSendSysMessage("Selected creature is already member of group %u", pCreature->GetFormationID());
+		PSendSysMessage("Selected creature is already member of group %u", pCreature->GetFormation()->GetId());
         return false;
     }
 

src/game/MotionMaster.cpp

@@ -525,9 +525,9 @@ void MotionMaster::DelayedDelete(_Ty curr)
 
 bool MotionMaster::GetDestination(float &x, float &y, float &z)
 {
-   if(empty())
+	if(empty() || !Impl[i_top] || isStatic(Impl[i_top]))
        return false;
-
-   return top()->GetDestination(x,y,z);
+	
+	return top()->GetDestination(x,y,z);
 }
 

src/game/MotionMaster.h

@@ -76,7 +76,7 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *>
         typedef std::vector<_Ty> ExpireList;
         int i_top;
 
-        bool empty() const { return i_top < 0; }
+        bool empty() const { return (i_top < 0); }
         void pop() { Impl[i_top] = NULL; --i_top; }
         void push(_Ty _Val) { ++i_top; Impl[i_top] = _Val; }
 

src/game/Traveller.h

@@ -110,9 +110,11 @@ template<>
 inline void Traveller<Creature>::MoveTo(float x, float y, float z, uint32 t)
 {
     //Call for creature group update
-    if(i_traveller.IsFormationLeader() && !i_traveller.isInCombat() &&
-        CreatureGroupHolder.find(i_traveller.GetFormationID()) != CreatureGroupHolder.end())
-        CreatureGroupHolder[i_traveller.GetFormationID()]->LeaderMovedInEvade();
+	if(i_traveller.GetFormation() && i_traveller.GetFormation()->getLeader() == &i_traveller && !i_traveller.isInCombat())
+	{
+        i_traveller.GetFormation()->LeaderMovedInEvade();
+		sLog.outDebug("Traveller<Creature>::MoveTo(){GUID %u calls LeaderMovedInEvade()}", i_traveller.GetGUIDLow());
+	}
 
     //i_traveller.AI_SendMoveToPacket(x, y, z, t, i_traveller.GetUnitMovementFlags(), 0);
     i_traveller.SendMonsterMove(x, y, z, t);

src/game/Unit.cpp

@@ -9556,12 +9556,11 @@ void Unit::CombatStart(Unit* target)
     }
 
     //Call creature group update
-    if(GetTypeId()==TYPEID_UNIT && ((Creature*)this)->GetFormationID())
-    {
-        CreatureGroupHolderType::iterator itr = CreatureGroupHolder.find(((Creature*)this)->GetFormationID());
-        if(itr != CreatureGroupHolder.end())
-           itr->second->MemberHasAttacked(((Creature*)this));
-    }
+	if(GetTypeId()==TYPEID_UNIT && ((Creature*)this)->GetFormation())
+	{
+		((Creature*)this)->GetFormation()->MemberHasAttacked(*(Creature*)this);
+		sLog.outDebug("Unit::CombatStart() calls CreatureGroups::MemberHasAttacked(this);");
+	}
 }
 
 void Unit::SetInCombatState(bool PvP)

src/game/WaypointMovementGenerator.cpp

@@ -52,9 +52,9 @@ void WaypointMovementGenerator<Creature>::MovementInform(Creature &unit)
 template<>
 bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
 {
-    if(i_destinationHolder.HasArrived())
+	if(i_destinationHolder.HasArrived())
         return false;
-
+	
     i_destinationHolder.GetDestination(x, y, z);
     return true;
 }