*Should fix a crash, thanks Drahy
--HG-- branch : trunk
This commit is contained in:
@@ -545,7 +545,8 @@ void Creature::Update(uint32 diff)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || !getVictim() ||
|
bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || !getVictim() ||
|
||||||
getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster());
|
(getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() &&
|
||||||
|
getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster()));
|
||||||
|
|
||||||
if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed)
|
if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed)
|
||||||
m_regenTimer -= diff;
|
m_regenTimer -= diff;
|
||||||
|
|||||||
Reference in New Issue
Block a user