[7652] Fixed unexpected GM death at deep swim. Author: VladimirMangos

--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-11 23:11:37 -05:00
parent 88b4ecdb03
commit f1b2e437a4
+8 -4
View File
@@ -319,10 +319,14 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
if(plMover->isAlive()) if(plMover->isAlive())
{ {
plMover->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, GetPlayer()->GetMaxHealth()); plMover->EnvironmentalDamage(DAMAGE_FALL_TO_VOID, GetPlayer()->GetMaxHealth());
// change the death state to CORPSE to prevent the death timer from // pl can be alive if GM/etc
// starting in the next player update if(!plMover->isAlive())
plMover->KillPlayer(); {
plMover->BuildPlayerRepop(); // 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 // cancel the death timer here if started