fix: check null pointer from master on no-pvp combat. #3356
Conversation
This file contains 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
Contributor
kaleohanopahala
commented
Feb 10, 2025
kaleohanopahala
commented
- Now the code checks for a null target right away to prevent crashes.
- The summon condition is moved up, eliminating redundant checks.
- Unnecessary null verifications (like if (target && ...)) have been removed.
- Validations for tile properties and PvP conditions are reorganized for clearer and more efficient logic.
dudantas
reviewed
Feb 10, 2025
src/creatures/combat/combat.cpp
Outdated
| if (player->hasFlag(PlayerFlags_t::IgnoreProtectionZone)) { | ||
| return RETURNVALUE_NOERROR; | ||
| } | ||
| const auto player = caster->getPlayer(); |
There was a problem hiding this comment.
Declare as const ref (&), to avoid increment reference counter (same for the others variables)
Suggested change
| const auto player = caster->getPlayer(); | |
| const auto &player = caster->getPlayer(); |
There was a problem hiding this comment.
Ins't?
const auto& player = caster->getPlayer();
There was a problem hiding this comment.
Now it's time to make lunch. Later, I can come back and check if everything is in order.
I updated it as you mentioned, and I believe it's good.
Thanks for the tip!
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.