From 5e43850e8ef5333b03b9e08265bc4620eba53866 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 31 Jan 2026 20:33:33 +0000
Subject: [PATCH 2/2] Restrict suppression system to clients and client pets
 only

Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com>
---
 zone/spell_effects.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp
index eb88b10f1..eeada73a8 100644
--- a/zone/spell_effects.cpp
+++ b/zone/spell_effects.cpp
@@ -4688,8 +4688,9 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses, bool suppress, uint32 su
 			client->QueuePacket(action_packet);
 			safe_delete(action_packet);
 			client->ReapplyBuff(slot, true);
-		} else {
-			// Reapply visual/state effects for non-client mobs (pets, NPCs, bots)
+		} else if (IsPet() && GetOwner() && GetOwner()->IsClient()) {
+			// Reapply visual/state effects for client pets only
+			// All other non-client mobs (NPCs, bots, mercs) use normal dispel mechanic
 			if (!IsValidSpell(buffs[slot].spellid))
 				return;
 			const auto& spell = spells[buffs[slot].spellid];