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

Resolve merge conflict with updated base branch

Browse Source 
Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-01-31 20:31:19 +00:00
parent c9bee6cf0a
commit 9a657e7d6a
1 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zone/spell_effects.cpp
View File

@ -4693,6 +4693,8 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses, bool suppress, uint32 su
if (!IsValidSpell(buffs[slot].spellid)) if (!IsValidSpell(buffs[slot].spellid))
return; return;
const auto& spell = spells[buffs[slot].spellid]; const auto& spell = spells[buffs[slot].spellid];
if (IsValidSpell(buffs[slot].spellid)) {
const auto &spell = spells[buffs[slot].spellid];
// Restore nimbus (visual aura) effect before processing individual spell effects, // Restore nimbus (visual aura) effect before processing individual spell effects,
// mirroring Client::ReapplyBuff and bot buff restoration behavior. // mirroring Client::ReapplyBuff and bot buff restoration behavior.
if (spell.nimbus_effect) { if (spell.nimbus_effect) {
@ -4739,6 +4741,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses, bool suppress, uint32 su
} }
} }
} }
}
} else { } else {
buffs[slot].spellid = SPELL_UNKNOWN; buffs[slot].spellid = SPELL_UNKNOWN;
} }