sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Spells): Drop combat on Mind Control cancel. (#10201)

Browse Source 
Fixes #9980
This commit is contained in:
UltraNix
2022-01-17 02:26:23 +01:00
committed by GitHub
parent b74fb81b8c
commit e842119605
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.h
+1
View File
@@ -1613,6 +1613,7 @@ public:
void ClearInCombat(); void ClearInCombat();
void ClearInPetCombat(); void ClearInPetCombat();
[[nodiscard]] uint32 GetCombatTimer() const { return m_CombatTimer; } [[nodiscard]] uint32 GetCombatTimer() const { return m_CombatTimer; }
void SetCombatTimer(uint32 timer) { m_CombatTimer = timer; }
[[nodiscard]] bool HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint32 familyFlags) const; [[nodiscard]] bool HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint32 familyFlags) const;
[[nodiscard]] bool virtual HasSpell(uint32 /*spellID*/) const { return false; } [[nodiscard]] bool virtual HasSpell(uint32 /*spellID*/) const { return false; }
src/server/scripts/Spells/spell_priest.cpp
+18 -8
View File
@@ -808,29 +808,39 @@ class spell_pri_vampiric_touch : public AuraScript
}; };
// 605 - Mind Control // 605 - Mind Control
class spell_pri_mind_control : public SpellScript class spell_pri_mind_control : public AuraScript
{ {
PrepareSpellScript(spell_pri_mind_control); PrepareAuraScript(spell_pri_mind_control);
void OnHit() void HandleApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Aura const* aura = GetHitAura())
{ {
if (Unit* caster = GetCaster()) if (Unit* caster = GetCaster())
{ {
if (Unit* target = GetHitUnit()) if (Unit* target = GetTarget())
{ {
uint32 duration = static_cast<uint32>(aura->GetMaxDuration()); uint32 duration = static_cast<uint32>(GetDuration());
caster->SetInCombatWith(target, duration); caster->SetInCombatWith(target, duration);
target->SetInCombatWith(caster, duration); target->SetInCombatWith(caster, duration);
} }
} }
} }
void HandleRemoveEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* caster = GetCaster())
{
if (Unit* target = GetTarget())
{
caster->SetCombatTimer(0);
target->SetCombatTimer(0);
}
}
} }
void Register() override void Register() override
{ {
AfterHit += SpellHitFn(spell_pri_mind_control::OnHit); AfterEffectApply += AuraEffectApplyFn(spell_pri_mind_control::HandleApplyEffect, EFFECT_0, SPELL_AURA_MOD_POSSESS, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_pri_mind_control::HandleRemoveEffect, EFFECT_0, SPELL_AURA_MOD_POSSESS, AURA_EFFECT_HANDLE_REAL);
} }
}; };