fix(Scripts/Naxx): Thaddius Ball Lightning should check all players i… #24392
+11
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Script
sogladev
requested changes
Jan 12, 2026
| } | ||
|
|
||
| if (me->IsWithinMeleeRange(me->GetVictim())) | ||
| if (IsAnyPlayerInMeleeRange()) |
Member
There was a problem hiding this comment.
This IsAnyPlayerInMeleeRange is better part of the ballLightningEnabled check.
else if (ballLightningEnabled && !IsAnyPlayerInMeleeRange)| bool IsAnyPlayerInMeleeRange() const | ||
| { | ||
| for (auto const& ref : me->GetThreatMgr().GetThreatList()) | ||
| { |
Member
There was a problem hiding this comment.
extra brackets can be removed
https://www.azerothcore.org/wiki/cpp-code-standards#brackets
Contributor
Author
There was a problem hiding this comment.
I forced pushed commit
Member
|
I faintly remember something like SelectNearestPlayer() existing |
…n melee range Ball Lightning was being cast even when melee players (other than the tank) were in range of the boss. Added IsAnyPlayerInMeleeRange() helper function to check if any player on the threat list is within melee range. Closes azerothcore#24372
xDevICCI
force-pushed
the
fix-thaddius-ball-lightning
branch
from
b12bf4f to
62b7346
Compare
Kitzunu
reviewed
Jan 13, 2026
Comment on lines
+132
to
+140
| bool IsAnyPlayerInMeleeRange() const | ||
| { | ||
| for (auto const& ref : me->GetThreatMgr().GetThreatList()) | ||
| if (Unit* target = ref->getTarget()) | ||
| if (target->IsPlayer() && me->IsWithinMeleeRange(target)) | ||
| return true; | ||
| return false; | ||
| } | ||
|
|
Member
There was a problem hiding this comment.
You could just use SelectNearestTarget() to see if it returns anything within melee range
Rorschach91
added
Ready to be Reviewed
Tested
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ball Lightning was being cast even when melee players (other than the tank) were in range of the boss. Added IsAnyPlayerInMeleeRange() helper function to check if any player on the threat list is within melee range.
Closes #24372
Changes Proposed:
This PR proposes changes to:
AI-assisted Pull Requests
Claude was used to help analyze the code and identify the root cause of the issue.
Issues Addressed:
SOURCE:
The changes have been validated through:
Sources from the issue:
Both sources confirm Ball Lightning should only be cast when no players are in melee range.
Tests Performed:
This PR has been:
How to Test the Changes:
Known Issues and TODO List: