pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 13:38:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup BlockedBuffs logic in SpellOnTarget

Browse Source
This commit is contained in:
nytmyr
2025-01-26 22:23:55 -06:00
parent 3dfa099718
commit 323f144984
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+15 -6
View File
@@ -4062,13 +4062,22 @@ bool Mob::SpellOnTarget(
return false; return false;
} }
bool client_blocked_buffs =
RuleB(Spells, EnableBlockedBuffs) &&
(
spelltar->IsClient() ||
(spelltar->IsPet() && spelltar->IsPetOwnerClient())
);
bool bot_blocked_buffs =
RuleB(Bots, AllowBotBlockedBuffs) &&
(
spelltar->IsBot() ||
(spelltar->IsPet() && spelltar->IsPetOwnerBot())
);
// now check if the spell is allowed to land // now check if the spell is allowed to land
if ( if (client_blocked_buffs || bot_blocked_buffs) {
(RuleB(Spells, EnableBlockedBuffs) && spelltar->IsClient()) ||
(RuleB(Spells, EnableBlockedBuffs) && spelltar->IsPet() && spelltar->GetOwner() && spelltar->GetOwner()->IsClient()) ||
(RuleB(Bots, AllowBotBlockedBuffs) && spelltar->IsBot()) ||
(RuleB(Bots, AllowBotBlockedBuffs) && spelltar->IsPet() && spelltar->GetOwner() && spelltar->GetOwner()->IsBot())
) {
// We return true here since the caster's client should act like normal // We return true here since the caster's client should act like normal
if (spelltar->IsBlockedBuff(spell_id)) { if (spelltar->IsBlockedBuff(spell_id)) {
LogSpells( LogSpells(