Buff/Debuff Removal Bug

FallenDev · FallenDev · commit aad6bb7d187d · 2026-02-06T10:04:04.000-05:00
diff --git a/Zolian.Server.Base/GameScripts/Monsters/TrainingDummy.cs b/Zolian.Server.Base/GameScripts/Monsters/TrainingDummy.cs
@@ -72,13 +72,13 @@ public override void OnDeath(WorldClient client = null)
         foreach (var debuff in Monster.Debuffs.Values)
         {
             if (debuff != null)
-                Monster.Debuffs.TryRemove(debuff.Name, out _);
+                Monster.RemoveDebuff(debuff.Name);
         }
 
         foreach (var debuff in Monster.Buffs.Values)
         {
             if (debuff != null)
-                Monster.Buffs.TryRemove(debuff.Name, out _);
+                Monster.RemoveBuff(debuff.Name);
         }
 
         Monster.Skulled = false;
@@ -139,13 +139,13 @@ public override void OnDeath(WorldClient client = null)
         foreach (var debuff in Monster.Debuffs.Values)
         {
             if (debuff != null)
-                Monster.Debuffs.TryRemove(debuff.Name, out _);
+                Monster.RemoveDebuff(debuff.Name);
         }
 
         foreach (var debuff in Monster.Buffs.Values)
         {
             if (debuff != null)
-                Monster.Buffs.TryRemove(debuff.Name, out _);
+                Monster.RemoveBuff(debuff.Name);
         }
 
         Monster.Skulled = false;
diff --git a/Zolian.Server.Base/GameScripts/Skills/BerserkerSkillTree.cs b/Zolian.Server.Base/GameScripts/Skills/BerserkerSkillTree.cs
@@ -319,10 +319,10 @@ protected override void OnSuccess(Sprite sprite)
                 }
 
                 if (damageable.HasDebuff("Beag Suain"))
-                    damageable.Debuffs.TryRemove("Beag Suain", out _);
+                    damageable.RemoveDebuff("Beag Suain");
 
                 if (damageable.HasDebuff("Silence"))
-                    damageable.Debuffs.TryRemove("Silence", out _);
+                    damageable.RemoveDebuff("Silence");
 
                 damageable.ApplyDamage(damageDealer, 0, Skill);
                 damageable.SendAnimationNearby(Skill.Template.TargetAnimation, null, damageable.Serial);
diff --git a/Zolian.Server.Base/GameScripts/Skills/DefenderSkillTree.cs b/Zolian.Server.Base/GameScripts/Skills/DefenderSkillTree.cs
@@ -60,10 +60,10 @@ protected override void OnSuccess(Sprite sprite)
                 }
 
                 if (damageable.HasDebuff("Beag Suain"))
-                    damageable.Debuffs.TryRemove("Beag Suain", out _);
+                    damageable.RemoveDebuff("Beag Suain");
 
                 if (damageable.HasDebuff("Silence"))
-                    damageable.Debuffs.TryRemove("Silence", out _);
+                    damageable.RemoveDebuff("Silence");
 
                 damageable.ApplyDamage(damageDealer, 0, Skill);
                 damageable.SendAnimationNearby(Skill.Template.TargetAnimation, null, damageable.Serial);
diff --git a/Zolian.Server.Base/GameScripts/Skills/GlobalSkillMethods.cs b/Zolian.Server.Base/GameScripts/Skills/GlobalSkillMethods.cs
@@ -149,21 +149,9 @@ public static bool OnUse(Aisling aisling, Skill skill)
                 (skill.Template.PostQualifiers.QualifierFlagIsSet(PostQualifier.BreakInvisible) ||
                  skill.Template.PostQualifiers.QualifierFlagIsSet(PostQualifier.Both)))
             {
-                if (client.Aisling.Buffs.TryRemove("Hide", out var hide))
-                {
-                    hide.OnEnded(client.Aisling, hide);
-                }
-
-                if (client.Aisling.Buffs.TryRemove("Shadowfade", out var shadowFade))
-                {
-                    shadowFade.OnEnded(client.Aisling, shadowFade);
-                }
-
-                if (client.Aisling.Buffs.TryRemove("Blend", out var blend))
-                {
-                    blend.OnEnded(client.Aisling, blend);
-                }
-
+                aisling.RemoveBuff("Hide");
+                aisling.RemoveBuff("Shadowfade");
+                aisling.RemoveBuff("Blend");
                 client.UpdateDisplay();
                 return Attempt(client, skill);
             }
diff --git a/Zolian.Server.Base/Sprites/Entity/Aisling.cs b/Zolian.Server.Base/Sprites/Entity/Aisling.cs
@@ -312,21 +312,9 @@ public void CastSpell(Spell spell, CastInfo info)
                     {
                         if (IsInvisible && (spell.Template.PostQualifiers.QualifierFlagIsSet(PostQualifier.BreakInvisible) || spell.Template.PostQualifiers.QualifierFlagIsSet(PostQualifier.Both)))
                         {
-                            if (Buffs.TryRemove("Hide", out var hide))
-                            {
-                                hide.OnEnded(Client.Aisling, hide);
-                            }
-
-                            if (Buffs.TryRemove("Shadowfade", out var shadowFade))
-                            {
-                                shadowFade.OnEnded(Client.Aisling, shadowFade);
-                            }
-
-                            if (Buffs.TryRemove("Blend", out var blend))
-                            {
-                                blend.OnEnded(Client.Aisling, blend);
-                            }
-
+                            RemoveBuff("Hide");
+                            RemoveBuff("Shadowfade");
+                            RemoveBuff("Blend");
                             Client.UpdateDisplay();
                         }
 
diff --git a/Zolian.Server.Base/Sprites/Sprite.cs b/Zolian.Server.Base/Sprites/Sprite.cs
@@ -509,26 +509,23 @@ private void RemoveAllDebuffs()
             RemoveDebuff(debuff.Key);
     }
 
-    private bool RemoveBuff(string buff)
+    public bool RemoveBuff(string buff)
     {
         if (!HasBuff(buff)) return false;
 
-        lock (Buffs)
+        try
         {
-            try
+            var buffObj = Buffs.TryGetValue(buff, out var foundBuff);
+            if (buffObj)
             {
-                var buffObj = Buffs.TryGetValue(buff, out var foundBuff);
-                if (buffObj)
-                {
-                    if (foundBuff.Name.Contains("XP")) return false;
-                    foundBuff.OnEnded(this, foundBuff);
-                }
-            }
-            catch
-            {
-                // ignored
+                if (foundBuff.Name.Contains("XP")) return false;
+                foundBuff.OnEnded(this, foundBuff);
             }
         }
+        catch
+        {
+            // ignored
+        }
 
         return true;
     }
@@ -544,22 +541,19 @@ public bool RemoveDebuff(string debuff, bool cancelled = false)
         if (!cancelled && debuff == "Skulled") return true;
         if (!HasDebuff(debuff)) return false;
 
-        lock (Debuffs)
+        try
         {
-            try
+            var debuffObj = Debuffs.TryGetValue(debuff, out var foundDebuff);
+            if (debuffObj)
             {
-                var debuffObj = Debuffs.TryGetValue(debuff, out var foundDebuff);
-                if (debuffObj)
-                {
-                    foundDebuff.Cancelled = cancelled;
-                    foundDebuff.OnEnded(this, foundDebuff);
-                }
-            }
-            catch
-            {
-                // ignored
+                foundDebuff.Cancelled = cancelled;
+                foundDebuff.OnEnded(this, foundDebuff);
             }
         }
+        catch
+        {
+            // ignored
+        }
 
         return true;
     }

Original file line number	Diff line number	Diff line change
`@@ -72,13 +72,13 @@ public override void OnDeath(WorldClient client = null)`
`72`	`72`	`foreach (var debuff in Monster.Debuffs.Values)`
`73`	`73`	`{`
`74`	`74`	`if (debuff != null)`
`75`		`- Monster.Debuffs.TryRemove(debuff.Name, out _);`
	`75`	`+ Monster.RemoveDebuff(debuff.Name);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`foreach (var debuff in Monster.Buffs.Values)`
`79`	`79`	`{`
`80`	`80`	`if (debuff != null)`
`81`		`- Monster.Buffs.TryRemove(debuff.Name, out _);`
	`81`	`+ Monster.RemoveBuff(debuff.Name);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`Monster.Skulled = false;`
`@@ -139,13 +139,13 @@ public override void OnDeath(WorldClient client = null)`
`139`	`139`	`foreach (var debuff in Monster.Debuffs.Values)`
`140`	`140`	`{`
`141`	`141`	`if (debuff != null)`
`142`		`- Monster.Debuffs.TryRemove(debuff.Name, out _);`
	`142`	`+ Monster.RemoveDebuff(debuff.Name);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`foreach (var debuff in Monster.Buffs.Values)`
`146`	`146`	`{`
`147`	`147`	`if (debuff != null)`
`148`		`- Monster.Buffs.TryRemove(debuff.Name, out _);`
	`148`	`+ Monster.RemoveBuff(debuff.Name);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`Monster.Skulled = false;`
Original file line number	Diff line number	Diff line change
`@@ -509,26 +509,23 @@ private void RemoveAllDebuffs()`
`509`	`509`	`RemoveDebuff(debuff.Key);`
`510`	`510`	`}`
`511`	`511`
`512`		`- private bool RemoveBuff(string buff)`
	`512`	`+ public bool RemoveBuff(string buff)`
`513`	`513`	`{`
`514`	`514`	`if (!HasBuff(buff)) return false;`
`515`	`515`
`516`		`- lock (Buffs)`
	`516`	`+ try`
`517`	`517`	`{`
`518`		`- try`
	`518`	`+ var buffObj = Buffs.TryGetValue(buff, out var foundBuff);`
	`519`	`+ if (buffObj)`
`519`	`520`	`{`
`520`		`- var buffObj = Buffs.TryGetValue(buff, out var foundBuff);`
`521`		`- if (buffObj)`
`522`		`- {`
`523`		`- if (foundBuff.Name.Contains("XP")) return false;`
`524`		`- foundBuff.OnEnded(this, foundBuff);`
`525`		`- }`
`526`		`- }`
`527`		`- catch`
`528`		`- {`
`529`		`- // ignored`
	`521`	`+ if (foundBuff.Name.Contains("XP")) return false;`
	`522`	`+ foundBuff.OnEnded(this, foundBuff);`
`530`	`523`	`}`
`531`	`524`	`}`
	`525`	`+ catch`
	`526`	`+ {`
	`527`	`+ // ignored`
	`528`	`+ }`
`532`	`529`
`533`	`530`	`return true;`
`534`	`531`	`}`
`@@ -544,22 +541,19 @@ public bool RemoveDebuff(string debuff, bool cancelled = false)`
`544`	`541`	`if (!cancelled && debuff == "Skulled") return true;`
`545`	`542`	`if (!HasDebuff(debuff)) return false;`
`546`	`543`
`547`		`- lock (Debuffs)`
	`544`	`+ try`
`548`	`545`	`{`
`549`		`- try`
	`546`	`+ var debuffObj = Debuffs.TryGetValue(debuff, out var foundDebuff);`
	`547`	`+ if (debuffObj)`
`550`	`548`	`{`
`551`		`- var debuffObj = Debuffs.TryGetValue(debuff, out var foundDebuff);`
`552`		`- if (debuffObj)`
`553`		`- {`
`554`		`- foundDebuff.Cancelled = cancelled;`
`555`		`- foundDebuff.OnEnded(this, foundDebuff);`
`556`		`- }`
`557`		`- }`
`558`		`- catch`
`559`		`- {`
`560`		`- // ignored`
	`549`	`+ foundDebuff.Cancelled = cancelled;`
	`550`	`+ foundDebuff.OnEnded(this, foundDebuff);`
`561`	`551`	`}`
`562`	`552`	`}`
	`553`	`+ catch`
	`554`	`+ {`
	`555`	`+ // ignored`
	`556`	`+ }`
`563`	`557`
`564`	`558`	`return true;`
`565`	`559`	`}`