From 1ccf5dd805d3a94db0f5daab4aad0792d9e5aa76 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 9 Mar 2026 21:34:30 +0000
Subject: [PATCH] Drop suppressed illusions on zone/relog session change

Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com>
---
 zone/zonedb.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index 9885af113..7683961f7 100644
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -3053,6 +3053,13 @@ void ZoneDatabase::LoadBuffs(Client *client)
 
 	for (int slot_id = 0; slot_id < max_buff_slots; ++slot_id) {
 		if (buffs[slot_id].spellid == SPELL_SUPPRESSED) {
+			// Suppressed illusions should drop on zone/relog rather than being unsuppressed later
+			if (IsValidSpell(buffs[slot_id].suppressedid) &&
+			    IsEffectInSpell(buffs[slot_id].suppressedid, SpellEffect::Illusion)) {
+				buffs[slot_id].spellid                 = SPELL_UNKNOWN;
+				buffs[slot_id].suppressedid            = SPELL_UNKNOWN;
+				buffs[slot_id].suppressedticsremaining = -1;
+			}
 			continue;
 		}