Implement AURA_INTERRUPT_FLAG_LEAVE_COMBAT

(based on cmangos/mangos-wotlk@98c19de7a) Signed-off-by: Xfurry <xfurry.cmangos@outlook.com>
cmangos · Dec 10, 2017 · e448491 · e448491
1 parent 3ecd445
commit e448491
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
@@ -9066,6 +9066,8 @@ void Unit::ClearInCombat()
     }
     else
         ((Player*)this)->UpdatePotionCooldown();
+
+    RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LEAVE_COMBAT);
 }
 
 bool Unit::isTargetableForAttack(bool inverseAlive /*=false*/) const
@@ -9873,7 +9875,7 @@ bool Unit::IsTargetUnderControl(Unit const& target) const
 
     if (!charmerGuid)
         return false;
-    
+
     if (target.GetCharmerGuid() == charmerGuid)
         return true;
 
@@ -13019,7 +13021,7 @@ Unit* Unit::TakePossessOf(SpellEntry const* spellEntry, SummonPropertiesEntry co
 
     // set temp possess ai (creature will not be able to react by itself)
     charmInfo->SetCharmState("PossessedAI");
-    
+
     if (player)
     {
         // Initialize pet bar
@@ -13098,7 +13100,7 @@ bool Unit::TakePossessOf(Unit* possessed)
                 return true;
             }
         }
-        
+
         // player pet is unsmumoned while possessing
         player->UnsummonPetTemporaryIfAny();
 

diff --git a/src/game/Unit.h b/src/game/Unit.h
@@ -97,7 +97,7 @@ enum SpellAuraInterruptFlags
     AURA_INTERRUPT_FLAG_ENTER_COMBAT2               = 0x10000000,   // 28
     AURA_INTERRUPT_FLAG_UNK29                       = 0x20000000,   // 29
     AURA_INTERRUPT_FLAG_UNK30                       = 0x40000000,   // 30
-    AURA_INTERRUPT_FLAG_UNK31                       = 0x80000000,   // 31
+    AURA_INTERRUPT_FLAG_LEAVE_COMBAT                = 0x80000000,   // 31   removed by leaving combat
 };
 
 enum SpellPartialResist