pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-05 12:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #61 from Valorith/copilot/sub-pr-60

Browse Source 
Fix: skip suppressed slots in DispelMagic to prevent crash and incorrect buff restoration
This commit is contained in:
Vayle 2026-03-08 20:31:21 -04:00 committed by GitHub
commit 522b0c77be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/spell_effects.cpp
View File

@ -7536,19 +7536,21 @@ void Mob::DispelMagic(Mob* caster, uint16 spell_id, int effect_value, int chance
for (int slot = 0; slot < GetMaxTotalSlots(); ++slot) { for (int slot = 0; slot < GetMaxTotalSlots(); ++slot) {
auto s = buffs[slot].spellid; auto s = buffs[slot].spellid;
// Suppressed slots store a sentinel in spellid, so use the underlying spell
// for any lookup into the spell data table.
auto dispel_spell_id = s == SPELL_SUPPRESSED ? buffs[slot].suppressedid : s;
if (!IsValidSpell(dispel_spell_id) || spells[dispel_spell_id].dispel_flag != 0 || IsDiscipline(dispel_spell_id)) { // Suppressed buffs always return when suppression ends; they cannot be dispelled.
if (s == SPELL_SUPPRESSED) {
continue; continue;
} }
if (detrimental_only && !IsDetrimentalSpell(dispel_spell_id)) { if (!IsValidSpell(s) || spells[s].dispel_flag != 0 || IsDiscipline(s)) {
continue; continue;
} }
if (beneficial_only && IsDetrimentalSpell(dispel_spell_id)) { if (detrimental_only && !IsDetrimentalSpell(s)) {
continue;
}
if (beneficial_only && IsDetrimentalSpell(s)) {
continue; continue;
} }
@ -7570,7 +7572,7 @@ void Mob::DispelMagic(Mob* caster, uint16 spell_id, int effect_value, int chance
break; break;
} else { } else {
//Additional restrictions on which buffs can be suppressed //Additional restrictions on which buffs can be suppressed
if (spells[dispel_spell_id].short_buff_box) { if (spells[s].short_buff_box) {
continue; continue;
} }