StaticFlags: Implement IGNORE_SANCTUARY (#542)

* StaticFlags: Implement IGNORE_SANCTUARY * StaticFlags: Simplify Ignore Sanctuary
cmangos · Oct 6, 2024 · 26d23af · 26d23af
1 parent 74d69d4
commit 26d23af
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
@@ -2935,6 +2935,20 @@ void Creature::SetIgnoreFeignDeath(bool state)
         m_settings.RemoveFlag(CreatureStaticFlags2::IGNORE_FEIGN_DEATH);
 }
 
+bool Creature::IsIgnoringSanctuary() const
+{
+    return m_settings.HasFlag(CreatureStaticFlags2::IGNORE_SANCTUARY);
+}
+
+void Creature::SetIgnoreSanctuary(bool state)
+{
+    if (state)
+        m_settings.SetFlag(CreatureStaticFlags2::IGNORE_SANCTUARY);
+    else
+        m_settings.RemoveFlag(CreatureStaticFlags2::IGNORE_SANCTUARY);
+}
+
+
 void Creature::SetNoWoundedSlowdown(bool state)
 {
     if (state)

diff --git a/src/game/Entities/Creature.h b/src/game/Entities/Creature.h
@@ -850,6 +850,8 @@ class Creature : public Unit
         void SetNoReputation(bool state) { m_noReputation = state; }
         bool IsIgnoringFeignDeath() const override;
         void SetIgnoreFeignDeath(bool state);
+        bool IsIgnoringSanctuary() const override;
+        void SetIgnoreSanctuary(bool state);
 
         void SetNoWoundedSlowdown(bool state);
         bool IsNoWoundedSlowdown() const;

diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -12260,7 +12260,13 @@ bool Unit::IsAllowedDamageInArea(Unit* attacker, Unit* pVictim)
 
     // can't damage player controlled unit by player controlled unit in sanctuary
     AreaTableEntry const* area = GetAreaEntryByAreaID(pVictim->GetAreaId());
-    return !(area && area->flags & AREA_FLAG_SANCTUARY);
+    if (!area || !(area->flags & AREA_FLAG_SANCTUARY))
+        return true;
+
+    if (pVictim->IsIgnoringSanctuary())
+        return true;
+    else
+        return false;
 }
 
 class UnitVisitObjectsInRangeNotifyEvent : public BasicEvent

diff --git a/src/game/Entities/Unit.h b/src/game/Entities/Unit.h
@@ -2461,6 +2461,7 @@ class Unit : public WorldObject
         bool IsFeigningDeathSuccessfully() const { return hasUnitState(UNIT_STAT_FEIGN_DEATH); }
         void SetFeignDeath(bool apply, ObjectGuid casterGuid = ObjectGuid(), uint32 spellID = 0, bool dynamic = true, bool success = true);
         virtual bool IsIgnoringFeignDeath() const { return false; }
+        virtual bool IsIgnoringSanctuary() const { return false; }
 
         virtual bool IsSlowedInCombat() const { return false; }