aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAokromes <Aokromes@users.noreply.github.com>2015-09-21 22:18:34 +0200
committerCarbenium <carbenium@outlook.com>2015-09-25 00:16:55 +0200
commit0eace20ac3c77d7f6172c2f50453c40356a59225 (patch)
treebc3b679c4c24e104cc259d4a2b8bc5773ead0796 /src
parent074b00af373de61d462314c4355b3aa3f3312482 (diff)
Core/Creature: Fix formations to prevent crossover
By Malcrom (cherry picked from commit 57fabc78e42ad7b511ae66d12fbb824d2c8e75ee)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/CreatureGroups.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index 00e11ca9ef7..b94c91265ef 100644
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -228,10 +228,11 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z)
if (itr->second->point_1)
{
- if (m_leader->GetCurrentWaypointID() == itr->second->point_1)
+ if (m_leader->GetCurrentWaypointID() == itr->second->point_1 - 1)
itr->second->follow_angle = (2 * float(M_PI)) - itr->second->follow_angle;
- if (m_leader->GetCurrentWaypointID() == itr->second->point_2)
- itr->second->follow_angle = (2 * float(M_PI)) + itr->second->follow_angle;
+
+ if (m_leader->GetCurrentWaypointID() == itr->second->point_2 - 1)
+ itr->second->follow_angle = (float(M_PI)) + itr->second->follow_angle;
}
float angle = itr->second->follow_angle;