pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 23:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Beacon] Revert a few lines of PR #4024 that broke beacons (#4118)

Browse Source
This commit is contained in:
Paul Coene 2024-02-24 16:18:17 -05:00 committed by GitHub
parent 1632ff04b0
commit e1dee55ecd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/beacon.cpp
View File

@ -140,11 +140,8 @@ bool Beacon::Process()
if (caster && spell_iterations-- && max_targets) { if (caster && spell_iterations-- && max_targets) {
// NPCs should never be affected by an AE they cast. PB AEs shouldn't affect caster either // NPCs should never be affected by an AE they cast. PB AEs shouldn't affect caster either
// I don't think any other cases that get here matter // I don't think any other cases that get here matter
const bool affect_caster = ( const bool affect_caster = (!caster->IsNPC() && !caster->IsAIControlled()) &&
!caster->IsNPC() && spells[spell_id].target_type != ST_AECaster;
!caster->IsAIControlled() &&
spells[spell_id].target_type != ST_AECaster
);
entity_list.AESpell(caster, this, spell_id, affect_caster, resist_adjust, &max_targets); entity_list.AESpell(caster, this, spell_id, affect_caster, resist_adjust, &max_targets);
} else { } else {
// spell is done casting, or caster disappeared // spell is done casting, or caster disappeared
@ -172,7 +169,8 @@ void Beacon::AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 in_resist_
caster_id = caster->GetID(); caster_id = caster->GetID();
spell_id = cast_spell_id; spell_id = cast_spell_id;
resist_adjust = in_resist_adjust; resist_adjust = in_resist_adjust;
spell_iterations = ((spells[spell_id].aoe_duration / 2500) < 1) ? 1 : spell_iterations; spell_iterations = spells[spell_id].aoe_duration / 2500;
spell_iterations = spell_iterations < 1 ? 1 : spell_iterations; // at least 1
if (spells[spell_id].aoe_max_targets) { if (spells[spell_id].aoe_max_targets) {
max_targets = spells[spell_id].aoe_max_targets; max_targets = spells[spell_id].aoe_max_targets;