diff options
| author | Brian <runningnak3d@gmail.com> | 2010-03-02 10:00:40 -0700 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-03-02 10:00:40 -0700 |
| commit | d3e09cb65f1c3e61263040708c8ac1a8e4ee4f42 (patch) | |
| tree | 6c2db3a4d08fcafcd5ba0a8fe5bc079efda4ea08 /src | |
| parent | 29666451f3a616eaa1f50cb99d9379124b4bfe28 (diff) | |
| parent | dff5bdedac416c66cb78e619f46b7af7699d675f (diff) | |
* merge
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/GridNotifiers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp index e9e1449fa25..5617fe19358 100644 --- a/src/game/GridNotifiers.cpp +++ b/src/game/GridNotifiers.cpp @@ -115,7 +115,7 @@ VisibleChangesNotifier::Visit(DynamicObjectMapType &m) inline void CreatureUnitRelocationWorker(Creature* c, Unit* u) { - if(!u->isAlive() || !c->isAlive() || u->isInFlight()) + if(!u->isAlive() || !c->isAlive() || c == u || u->isInFlight()) return; if(c->HasReactState(REACT_AGGRESSIVE) && !c->hasUnitState(UNIT_STAT_SIGHTLESS)) |