mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7652] Fixed unexpected GM death at deep swim.

Browse source
This commit is contained in:
VladimirMangos 2009-04-12 02:32:20 +04:00
parent 1bf2138948
commit 278cd970f4
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/MovementHandler.cpp
View file

@ -317,10 +317,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

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7651" #define REVISION_NR "7652"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__