Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-10-06 17:12:06 +02:00
parent 2cd66e90c2 5722d5c402
commit 3bbc0d3324
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Unit.cpp
View File

@@ -11972,8 +11972,8 @@ void Unit::SetHealth(uint32 val)
if(getDeathState() == JUST_DIED)
val = 0;
// causes instant permadeath if you exit game while in combat?! :-|
//else if((getDeathState() & (DEAD | DEAD_FALLING)) != 0)
// val = 1;
else if((GetTypeId() == TYPEID_PLAYER) && (getDeathState() & (DEAD | DEAD_FALLING)) != 0)
val = 1;
else
{
uint32 maxHealth = GetMaxHealth();