From 278cd970f41547a10f2f5fab2ca9503a5aadeafe Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 12 Apr 2009 02:32:20 +0400 Subject: [PATCH] [7652] Fixed unexpected GM death at deep swim. --- src/game/MovementHandler.cpp | 12 ++++++++---- src/shared/revision_nr.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp index 9018bfb77..6e586593a 100644 --- a/src/game/MovementHandler.cpp +++ b/src/game/MovementHandler.cpp @@ -317,10 +317,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 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 640d0d75c..58758eaf2 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7651" + #define REVISION_NR "7652" #endif // __REVISION_NR_H__