Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Some better checks.. don't want to try and store a Unit* in a bool!

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-26 17:16:17 -07:00
parent f8155b4f95
commit 07084713d1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Creature.cpp
View File

@@ -544,8 +544,8 @@ void Creature::Update(uint32 diff)
if(!isAlive())
break;
bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || !getVictim() ||
(getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() &&
bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || getVictim() == NULL ||
(getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() != NULL &&
getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster()));
if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed)