From 45ec8fad69cf7d3a6e02fa52e6c34f8752326728 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 4 Jan 2022 17:58:26 -0500
Subject: [PATCH] Core/Spells: Fixed SPELL_EFFECT_DISPEL when target has 2
 spells with same ID

Port From (https://github.com/TrinityCore/TrinityCore/commit/24281a532365e287f45c679484c6c8d9340d9869)
---
 Source/Game/Spells/SpellEffects.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs
index ba9f14e3a..5653a46d2 100644
--- a/Source/Game/Spells/SpellEffects.cs
+++ b/Source/Game/Spells/SpellEffects.cs
@@ -1777,18 +1777,18 @@ namespace Game.Spells
 
                 if (dispelableAura.RollDispel())
                 {
-                    var successItr = successList.Find(dispelAura =>
+                    var successAura = successList.Find(dispelAura =>
                     {
-                        if (dispelAura.GetAura().GetId() == dispelableAura.GetAura().GetId())
+                        if (dispelAura.GetAura().GetId() == dispelableAura.GetAura().GetId() && dispelAura.GetAura().GetCaster() == dispelableAura.GetAura().GetCaster())
                             return true;
 
                         return false;
                     });
 
-                    if (successItr == null)
+                    if (successAura == null)
                         successList.Add(new DispelableAura(dispelableAura.GetAura(), 0, 1));
                     else
-                        successItr.IncrementCharges();
+                        successAura.IncrementCharges();
 
                     if (!dispelableAura.DecrementCharge())
                     {