aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-15 10:50:10 -0600
committermegamage <none@none>2009-03-15 10:50:10 -0600
commitabe53c5cb617a15dd5155ea7b383bc6b9618c4fa (patch)
tree5043691da13c58062702defeb032a3b63d4aee61 /src/game/Unit.cpp
parent3421942b2bfd96178493f853751aa4c4fabb3bb0 (diff)
*Fix a bug that mobs do not return home after wipe.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 50fc8c149b7..2c2d38f8f19 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9925,7 +9925,7 @@ void Unit::SetInCombatState(bool PvP)
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
- if(GetTypeId() != TYPEID_PLAYER)
+ if(GetTypeId() != TYPEID_PLAYER && GetMotionMaster()->GetMotionSlotType(MOTION_SLOT_IDLE) != IDLE_MOTION_TYPE)
((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
if(GetTypeId() != TYPEID_PLAYER && ((Creature*)this)->isPet())