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:
Tartalo
2010-06-28 20:32:56 +02:00
parent bb6d8a7e67 d2f6ae6f77
commit 5d3a529e84
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -1262,16 +1262,26 @@ bool Creature::LoadFromDB(uint32 guid, Map *map)
}
}
uint32 curhealth = data->curhealth;
if (curhealth)
uint32 curhealth;
if (!m_regenHealth)
{
curhealth = uint32(curhealth*_GetHealthMod(GetCreatureInfo()->rank));
if (curhealth < 1)
curhealth = 1;
curhealth = data->curhealth;
if (curhealth)
{
curhealth = uint32(curhealth*_GetHealthMod(GetCreatureInfo()->rank));
if (curhealth < 1)
curhealth = 1;
}
SetPower(POWER_MANA,data->curmana);
}
else
{
curhealth = GetMaxHealth();
SetPower(POWER_MANA,GetMaxPower(POWER_MANA));
}
SetHealth(m_deathState == ALIVE ? curhealth : 0);
SetPower(POWER_MANA,data->curmana);
// checked at creature_template loading
m_defaultMovementType = MovementGeneratorType(data->movementType);