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

Fix suppressed dispel crash in DispelMagic

Browse Source
This commit is contained in:
Vayle 2026-03-08 19:57:12 -04:00
parent db4f3d141d
commit 3f7e980cd5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zone/spell_effects.cpp
View File

@ -7536,16 +7536,19 @@ 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 (s == SPELL_UNKNOWN || spells[s].dispel_flag != 0 || IsDiscipline(s)) { if (!IsValidSpell(dispel_spell_id) || spells[dispel_spell_id].dispel_flag != 0 || IsDiscipline(dispel_spell_id)) {
continue; continue;
} }
if (detrimental_only && !IsDetrimentalSpell(s)) { if (detrimental_only && !IsDetrimentalSpell(dispel_spell_id)) {
continue; continue;
} }
if (beneficial_only && IsDetrimentalSpell(s)) { if (beneficial_only && IsDetrimentalSpell(dispel_spell_id)) {
continue; continue;
} }
@ -7567,7 +7570,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[s].short_buff_box) { if (spells[dispel_spell_id].short_buff_box) {
continue; continue;
} }