diff options
| author | megamage <none@none> | 2009-07-01 18:36:03 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-07-01 18:36:03 -0500 |
| commit | 4a8a89e1db1f103020ffecbb570e1c570c2e0d21 (patch) | |
| tree | d5e62fa664a0f36d668f738abc50ac9406d50e5a /src/game/Unit.cpp | |
| parent | 111dac5f94eac3fe26da2107842dea4e1aacd660 (diff) | |
[8103] More wide use IsInWorld checks and delayed at teleport operations. Author: Ambal
* IsInWorld used to prevent return unexpected not in world objects.
* Delayed operations need to process its in world state.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index dfe7bfb0df9..df5334e3324 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -8338,7 +8338,7 @@ bool Unit::Attack(Unit *victim, bool meleeAttack) return false; // dead units can neither attack nor be attacked - if(!isAlive() || !victim->isAlive()) + if(!isAlive() || !victim->IsInWorld() || !victim->isAlive()) return false; // player cannot attack in mount state |