[7365] Implement potion in combat delay proper work. Author: VladimirMangos

Original patch provided by miranda.conrado.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-02 17:01:41 -06:00
parent d7d7c3562a
commit c064c2e2e1
5 changed files with 45 additions and 1 deletions

View File

@@ -9476,6 +9476,8 @@ void Unit::ClearInCombat()
// Player's state will be cleared in Player::UpdateContestedPvP
if(GetTypeId()!=TYPEID_PLAYER)
clearUnitState(UNIT_STAT_ATTACK_PLAYER);
else
((Player*)this)->UpdatePotionCooldown();
if(GetTypeId() != TYPEID_PLAYER && ((Creature*)this)->isPet())
{