diff options
| -rw-r--r-- | src/game/MovementHandler.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index b5cf2b410b9..64c4fecdb53 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -319,10 +319,14 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data ) if(plMover->isAlive()) { plMover->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, GetPlayer()->GetMaxHealth()); - // change the death state to CORPSE to prevent the death timer from - // starting in the next player update - plMover->KillPlayer(); - plMover->BuildPlayerRepop(); + // pl can be alive if GM/etc + if(!plMover->isAlive()) + { + // change the death state to CORPSE to prevent the death timer from + // starting in the next player update + plMover->KillPlayer(); + plMover->BuildPlayerRepop(); + } } // cancel the death timer here if started |