aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/game/Creature.cpp17
-rw-r--r--src/game/Creature.h7
-rw-r--r--src/game/CreatureGroups.cpp211
-rw-r--r--src/game/CreatureGroups.h63
-rw-r--r--src/game/Level2.cpp11
-rw-r--r--src/game/Map.h6
-rw-r--r--src/game/Traveller.h5
-rw-r--r--src/game/Unit.cpp14
8 files changed, 191 insertions, 143 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index db64c07fa23..c69ae6e8d16 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -147,7 +147,7 @@ m_deathTimer(0), m_respawnTime(0), m_respawnDelay(25), m_corpseDelay(60), m_resp
m_gossipOptionLoaded(false), m_emoteState(0), m_isPet(false), m_isTotem(false), m_reactState(REACT_AGGRESSIVE),
m_regenTimer(2000), m_defaultMovementType(IDLE_MOTION_TYPE), 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_DBTableGuid(0), m_formationID(0)
+m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL),m_creatureInfo(NULL), m_DBTableGuid(0), m_formation(NULL)
{
m_valuesCount = UNIT_END;
@@ -191,8 +191,8 @@ void Creature::RemoveFromWorld()
///- Remove the creature from the accessor
if(IsInWorld())
{
- if(m_formationID)
- formation_mgr.DestroyGroup(m_formationID, GetGUID());
+ if(m_formation)
+ formation_mgr.RemoveCreatureFromGroup(m_formation, this);
ObjectAccessor::Instance().RemoveObject(this);
Unit::RemoveFromWorld();
}
@@ -204,12 +204,13 @@ void Creature::SearchFormation()
return;
uint32 lowguid = GetDBTableGUIDLow();
+ if(!lowguid)
+ return;
+
+ CreatureGroupInfoType::iterator frmdata = CreatureGroupMap.find(lowguid);
+ if(frmdata != CreatureGroupMap.end())
+ formation_mgr.AddCreatureToGroup(frmdata->second->leaderGUID, this);
- if(lowguid && CreatureGroupMap.find(lowguid) != CreatureGroupMap.end())
- {
- m_formationID = CreatureGroupMap[lowguid]->leaderGUID;
- formation_mgr.UpdateCreatureGroup(m_formationID, this);
- }
}
void Creature::RemoveCorpse()
diff --git a/src/game/Creature.h b/src/game/Creature.h
index 078edb7d865..6c59f325d3d 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -38,6 +38,7 @@ class CreatureAI;
class Quest;
class Player;
class WorldSession;
+class CreatureGroup;
enum Gossip_Option
{
@@ -629,8 +630,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();
@@ -694,7 +695,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())
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 55b56e0b94e..3b7a27cdab5 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -1,7 +1,7 @@
/*
- * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
- * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2009 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
@@ -23,43 +23,52 @@
#include "ObjectMgr.h"
#include "ProgressBar.h"
#include "Policies/SingletonImp.h"
+#include "CreatureAI.h"
#define MAX_DESYNC 5.0f
-//TODO: Create group manager for each map
+
INSTANTIATE_SINGLETON_1(CreatureGroupManager);
-UNORDERED_MAP<uint32, CreatureGroup*> CreatureGroupHolder;
-UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
+CreatureGroupInfoType CreatureGroupMap;
-void CreatureGroupManager::UpdateCreatureGroup(uint32 group_id, Creature *member)
+void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature *member)
{
- if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end())
+ Map *map = member->FindMap();
+ if(!map)
+ return;
+
+ CreatureGroupHolderType::iterator itr = map->CreatureGroupHolder.find(groupId);
+
+ //Add member to an existing group
+ if(itr != map->CreatureGroupHolder.end())
{
- sLog.outDebug("Group found: %u, inserting creature GUID: %u", group_id, member->GetGUIDLow());
- CreatureGroupHolder[group_id]->AddMember(member);
+ sLog.outDebug("Group found: %u, inserting creature GUID: %u, Group InstanceID %u", groupId, member->GetGUIDLow(), member->GetInstanceId());
+ itr->second->AddMember(member);
}
+ //Create new group
else
{
- sLog.outDebug("Group not found: %u. Creating new group.", group_id);
- CreatureGroup* formation = new CreatureGroup;
- CreatureGroupHolder[group_id] = formation;
- formation->AddMember(member);
+ sLog.outDebug("Group not found: %u. Creating new group.", groupId);
+ CreatureGroup* group = new CreatureGroup(groupId);
+ map->CreatureGroupHolder[groupId] = group;
+ group->AddMember(member);
}
}
-void CreatureGroupManager::DestroyGroup(uint32 group_id, uint64 guid)
+void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup *group, Creature *member)
{
- if(CreatureGroupHolder.find(group_id) != CreatureGroupHolder.end())
+ sLog.outDebug("Deleting member pointer to GUID: %u from group %u", group->GetId(), member->GetDBTableGUIDLow());
+ group->RemoveMember(member);
+
+ if(group->isEmpty())
{
- sLog.outDebug("Deleting member pointer to GUID: %u from group %u", group_id, guid);
- CreatureGroupHolder[group_id]->RemoveMember(guid);
+ Map *map = member->FindMap();
+ if(!map)
+ return;
- if(CreatureGroupHolder[group_id]->isEmpty())
- {
- sLog.outDebug("Deleting group %u", group_id);
- delete CreatureGroupHolder[group_id];
- CreatureGroupHolder.erase(group_id);
- }
+ sLog.outDebug("Deleting group with InstanceID %u", member->GetInstanceId());
+ map->CreatureGroupHolder.erase(group->GetId());
+ delete group;
}
}
@@ -73,7 +82,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,11 +96,11 @@ void CreatureGroupManager::LoadCreatureFormations()
return;
}
- uint32 total_records = result->GetRowCount(), lastLeaderGUID = 0;
+ uint32 total_records = result->GetRowCount();
barGoLink bar( total_records);
Field *fields;
- FormationMember *group_member;
+ FormationInfo *group_member;
//Loading data...
do
{
@@ -99,22 +108,36 @@ void CreatureGroupManager::LoadCreatureFormations()
bar.step();
//Load group member data
- group_member = new FormationMember;
+ group_member = new FormationInfo;
group_member->leaderGUID = fields[0].GetUInt32();
- group_member->memberGUID = fields[1].GetUInt32();
- group_member->groupAI = fields[4].GetUInt8();
+ uint32 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)
+ if(group_member->leaderGUID != memberGUID)
{
- group_member->follow_dist = fields[2].GetUInt32();
- group_member->follow_angle = fields[3].GetUInt32();
+ group_member->follow_dist = fields[2].GetUInt32();
+ group_member->follow_angle = fields[3].GetUInt32();
}
- CreatureGroupMap[group_member->memberGUID] = group_member;
+ // 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;
+ }
- if(lastLeaderGUID != group_member->leaderGUID)
- lastLeaderGUID = group_member->leaderGUID;
- }
+ result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", memberGUID);
+ if(!result)
+ {
+ sLog.outErrorDb("creature_formations table member guid %u incorrect (not exist)", memberGUID);
+ continue;
+ }
+ }
+
+ CreatureGroupMap[memberGUID] = group_member;
+ }
while(result->NextRow()) ;
sLog.outString();
@@ -126,90 +149,104 @@ void CreatureGroupManager::LoadCreatureFormations()
void CreatureGroup::AddMember(Creature *member)
{
- sLog.outDebug("Adding unit GUID: %u.", member->GetGUIDLow());
+ sLog.outDebug("CreatureGroup::AddMember: Adding unit GUIDLow: %u.", member->GetGUIDLow());
- 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())
+ //Check if it is a leader
+ if(member->GetDBTableGUIDLow() == m_groupID)
{
sLog.outDebug("Unit GUID: %u is formation leader. Adding group.", member->GetGUIDLow());
m_leader = member;
}
- //Add to the club
- CreatureGroupMembers[guid] = member;
- sLog.outDebug("Unit GUID: %u added.", member->GetGUID());
+
+ m_members[member] = CreatureGroupMap.find(member->GetDBTableGUIDLow())->second;
+ member->SetFormation(this);
}
-void CreatureGroup::RemoveMember(uint64 guid)
+void CreatureGroup::RemoveMember(Creature *member)
{
- if(CreatureGroupMembers.find(guid) != CreatureGroupMembers.end())
- CreatureGroupMembers.erase(guid);
+ if(m_leader == member)
+ m_leader = NULL;
+
+ m_members.erase(member);
+ member->SetFormation(NULL);
}
-void CreatureGroup::MemberHasAttacked(Creature *member)
+void CreatureGroup::MemberAttackStart(Creature *member, Unit *target)
{
- uint8 groupAI = CreatureGroupMap[member->GetDBTableGUIDLow()]->groupAI;;
+ uint8 groupAI = CreatureGroupMap[member->GetDBTableGUIDLow()]->groupAI;
+ if(!groupAI)
+ return;
- for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); itr++)
+ if(groupAI == 1 && member != m_leader)
+ return;
+
+ for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
- sLog.outDebug("AI:%u:Group member found: %u, attacked by %s.", groupAI, itr->second->GetGUIDLow(), member->getVictim()->GetName());
- if(itr->second)
- {
- switch(groupAI)
- {
- case 0:
- return;
- case 1:
- if(!member->IsFormationLeader())
- return;
- }
- //Attack if everything is OK
- itr->second->AI()->AttackStart(member->getVictim());
- }
+ 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());
+
+ //Skip one check
+ if(itr->first == member)
+ continue;
+
+ if(!itr->first->isAlive())
+ continue;
+
+ if(itr->first->getVictim())
+ continue;
+
+ if(itr->first->canAttack(target))
+ itr->first->AI()->AttackStart(target);
}
}
-void CreatureGroup::LeaderMovedInEvade()
+void CreatureGroup::FormationReset(bool dismiss)
{
- for(UNORDERED_MAP<uint64, Creature*>::iterator itr = CreatureGroupMembers.begin(); itr != CreatureGroupMembers.end(); itr++)
+ for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
- if(itr->second && itr->second->isAlive() && !itr->second->isInCombat() && !itr->second->getVictim())
- SetMemberDestination(itr->second);
+ if(itr->first != m_leader && itr->first->isAlive())
+ {
+ if(dismiss)
+ itr->first->GetMotionMaster()->Initialize();
+ else
+ itr->first->GetMotionMaster()->MoveIdle(MOTION_SLOT_IDLE);
+ sLog.outDebug("Set %s movement for member GUID: %u", dismiss ? "default" : "idle", itr->first->GetGUIDLow());
+ }
}
+ m_Formed = !dismiss;
}
-void CreatureGroup::SetMemberDestination(Creature *member)
+void CreatureGroup::LeaderMoveTo(float x, float y, float z)
{
- if(!member || !m_leader || member->IsFormationLeader())
+ if(!m_leader)
return;
- float x,y,z;
- uint32 lowguid = member->GetDBTableGUIDLow();
-
- UNORDERED_MAP<uint32, FormationMember*>::iterator itr2 = CreatureGroupMap.find(lowguid);
+ float pathangle = atan2(m_leader->GetPositionY() - y, m_leader->GetPositionX() - x);
- if(m_leader->GetMotionMaster()->GetDestination(x,y,z) && itr2 != CreatureGroupMap.end())
+ for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
{
- float dist, angle, pathangle;
+ Creature *member = itr->first;
+ if(member == m_leader || !member->isAlive() || member->getVictim())
+ continue;
- angle = CreatureGroupMap[lowguid]->follow_angle;
- dist = CreatureGroupMap[lowguid]->follow_dist;
- pathangle = atan2(m_leader->GetPositionY()-y, m_leader->GetPositionX()-x);
+ float angle = itr->second->follow_angle;
+ float dist = itr->second->follow_dist;
- x = x+cos(angle+pathangle)*dist;
- y = y+sin(angle+pathangle)*dist;
+ float dx = x + cos(angle + pathangle) * dist;
+ float dy = y + sin(angle + pathangle) * dist;
+ float dz = z;
- member->GetMotionMaster()->Clear();
+ Trinity::NormalizeMapCoord(dx);
+ Trinity::NormalizeMapCoord(dy);
- if(member->GetDistance(m_leader) < dist+MAX_DESYNC)
+ member->UpdateGroundPositionZ(dx, dy, dz);
+
+ if(member->GetDistance(m_leader) < dist + MAX_DESYNC)
member->SetUnitMovementFlags(m_leader->GetUnitMovementFlags());
else
member->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
- member->GetMotionMaster()->MovePoint(0, x, y, z);
+ member->GetMotionMaster()->MovePoint(0, dx, dy, dz);
+ member->SetHomePosition(dx, dy, dz, pathangle);
}
}
-
diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h
index dbf8dcec645..8c345aadd40 100644
--- a/src/game/CreatureGroups.h
+++ b/src/game/CreatureGroups.h
@@ -1,7 +1,7 @@
-/*
- * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
+/*
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
- * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
+ * Copyright (C) 2008-2009 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,49 +21,58 @@
#ifndef _FORMATIONS_H
#define _FORMATIONS_H
-#include <map>
-#include "Creature.h"
-#include "Policies/Singleton.h"
+#include "Common.h"
-struct FormationMember
+class CreatureGroup;
+
+struct FormationInfo
{
- float follow_dist;
- float follow_angle;
- uint32 memberGUID;
uint32 leaderGUID;
+ float follow_dist;
+ float follow_angle;
uint8 groupAI;
};
class CreatureGroupManager
{
public:
- void UpdateCreatureGroup(uint32 group_id, Creature *member);
- void DestroyGroup(uint32 group_id, uint64 guid);
+ void AddCreatureToGroup(uint32 group_id, Creature *creature);
+ void RemoveCreatureFromGroup(CreatureGroup *group, Creature *creature);
void LoadCreatureFormations();
};
+typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*> CreatureGroupInfoType;
+
+extern CreatureGroupInfoType CreatureGroupMap;
+
class CreatureGroup
{
- UNORDERED_MAP<uint64, Creature*>CreatureGroupMembers;
- Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
+ private:
+ Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
+ typedef std::map<Creature*, FormationInfo*> CreatureGroupMemberType;
+ CreatureGroupMemberType m_members;
+ uint32 m_groupID;
+ bool m_Formed;
+
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();}
-};
+ //Group cannot be created empty
+ explicit CreatureGroup(uint32 id) : m_groupID(id), m_leader(NULL), m_Formed(false) {}
+ ~CreatureGroup() { sLog.outDebug("Destroying group"); }
+
+ Creature* getLeader() const { return m_leader; }
+ uint32 GetId() const { return m_groupID; }
+ bool isEmpty() const { return m_members.empty(); }
+ bool isFormed() const { return m_Formed; }
-typedef UNORDERED_MAP<uint32, CreatureGroup*> CreatureGroupHolderType;
+ void AddMember(Creature *member);
+ void RemoveMember(Creature *member);
+ void FormationReset(bool dismiss);
-extern CreatureGroupHolderType CreatureGroupHolder;
-extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
+ void LeaderMoveTo(float x, float y, float z);
+ void MemberAttackStart(Creature* member, Unit *target);
+};
#define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()
#endif
-
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index a52e94cc1f1..4937d230142 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -4067,9 +4067,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;
}
@@ -4077,12 +4077,11 @@ bool ChatHandler::HandleNpcAddFormationCommand(const char* args)
return false;
Player *chr = m_session->GetPlayer();
- FormationMember *group_member;
+ FormationInfo *group_member;
- group_member = new FormationMember;
+ group_member = new FormationInfo;
group_member->follow_angle = pCreature->GetAngle(chr) - chr->GetOrientation();
group_member->follow_dist = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(),int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(),int(2)));
- group_member->memberGUID = lowguid;
group_member->leaderGUID = leaderGUID;
group_member->groupAI = 0;
@@ -4129,4 +4128,4 @@ bool ChatHandler::HandleNpcSetLinkCommand(const char* args)
PSendSysMessage("LinkGUID '%u' added to creature with DBTableGUID: '%u'", linkguid, pCreature->GetDBTableGUIDLow());
return true;
-} \ No newline at end of file
+}
diff --git a/src/game/Map.h b/src/game/Map.h
index 82136a0cc7e..f72b0c15ec3 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -43,6 +43,7 @@ class InstanceData;
class Group;
class InstanceSave;
class WorldObject;
+class CreatureGroup;
namespace ZThread
{
@@ -126,6 +127,8 @@ typedef UNORDERED_MAP<Creature*, CreatureMover> CreatureMoveList;
#define INVALID_HEIGHT -100000.0f // for check, must be equal to VMAP_INVALID_HEIGHT, real value for unknown height is VMAP_INVALID_HEIGHT_VALUE
#define MIN_UNLOAD_DELAY 1 // immediate unload
+typedef std::map<uint32/*leaderDBGUID*/, CreatureGroup*> CreatureGroupHolderType;
+
class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::ObjectLevelLockable<Map, ZThread::Mutex>
{
friend class MapReference;
@@ -274,6 +277,7 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
template<class NOTIFIER> void VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier);
template<class NOTIFIER> void VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier);
template<class NOTIFIER> void VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier);
+ CreatureGroupHolderType CreatureGroupHolder;
private:
void LoadVMap(int pX, int pY);
void LoadMap(uint32 mapid, uint32 instanceid, int x,int y);
@@ -328,6 +332,8 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
typedef std::set<WorldObject*> ActiveNonPlayers;
ActiveNonPlayers m_activeNonPlayers;
ActiveNonPlayers::iterator m_activeNonPlayersIter;
+
+
private:
typedef GridReadGuard ReadGuard;
typedef GridWriteGuard WriteGuard;
diff --git a/src/game/Traveller.h b/src/game/Traveller.h
index b8865282672..ee2ec55833f 100644
--- a/src/game/Traveller.h
+++ b/src/game/Traveller.h
@@ -79,11 +79,6 @@ inline void Traveller<Creature>::Relocation(float x, float y, float z, float ori
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();
-
i_traveller.AI_SendMoveToPacket(x, y, z, t, i_traveller.GetUnitMovementFlags(), 0);
}
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 6e7a2302c9f..468859726e1 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9496,7 +9496,14 @@ void Unit::CombatStart(Unit* target)
if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER
&& !((Creature*)target)->HasReactState(REACT_PASSIVE) && ((Creature*)target)->IsAIEnabled)
+ {
((Creature*)target)->AI()->AttackStart(this);
+ if(((Creature*)target)->GetFormation())
+ {
+ ((Creature*)target)->GetFormation()->MemberAttackStart((Creature*)target, this);
+ sLog.outDebug("Unit::CombatStart() calls CreatureGroups::MemberHasAttacked(this);");
+ }
+ }
SetInCombatWith(target);
target->SetInCombatWith(this);
@@ -9514,13 +9521,6 @@ void Unit::CombatStart(Unit* target)
me->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
}
- //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));
- }
}
void Unit::SetInCombatState(bool PvP)