Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Fix conquest logs / latent effects not applying when zoning into non conquest areas #4624

Merged

Conversation

xkoredev
Copy link
Contributor

I affirm:

  • I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
  • I have read and understood the Contributing Guide and the Code of Conduct.
  • I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

Please enter a player-facing description

Fix latent effects from conquest related items not triggering when zoning into new areas.
Fix latent effects from conquest related items not triggering in zones that are not part of conquest, but should otherwise trigger these effects (I,e sky / sea)

What does this pull request do? (Please be technical)

Steps to test these changes

Zone into a sea with items such as master caster bracelets. Check that latent applies and there are no errors logged about "Invalid conquest region passed to function"

Special Deployment Considerations

I (@xkoredev) have smoke tested this. I am cherry picking from ASB, but I affirm:

  • I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
  • I have read and understood the Contributing Guide and the Code of Conduct.
  • I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

Please enter a player-facing description

Fix latent effects from conquest related items not triggering when zoning into new areas.
Fix latent effects from conquest related items not triggering in zones that are not part of conquest, but should otherwise trigger these effects (I,e sky / sea)

What does this pull request do? (Please be technical)

Steps to test these changes

Zone into a sea with items such as master caster bracelets. Check that latent applies and there are no errors logged about "Invalid conquest region passed to function"

Special Deployment Considerations

I (@xkoredev) have smoke tested this. I am cherry picking from ASB, but @Radegast-FFXIV will properly test this and answer any questions.

@xkoredev xkoredev changed the title [core] Fix nation zone/login issues. [core] Fix conquest logs / latent effects not applying when zoning into non conquest areas Oct 20, 2023
Copy link
Contributor

@zach2good zach2good left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logically seems fine, just needs some styling

src/map/latent_effect_container.cpp Outdated Show resolved Hide resolved
src/map/latent_effect_container.cpp Show resolved Hide resolved
src/map/latent_effect_container.cpp Outdated Show resolved Hide resolved
@zach2good
Copy link
Contributor

I'm surprised clang-format passed some of these bits 🤔

@zach2good zach2good added the hold On hold, pending further action/info label Oct 22, 2023
@zach2good
Copy link
Contributor

Testing our new CI check: where I can do an approval, but it's pending requested changes (and then me removing the label I've put on)

@xkoredev
Copy link
Contributor Author

Testing our new CI check: where I can do an approval, but it's pending requested changes (and then me removing the label I've put on)

I was planning on Radegast-FFXIV to make these changes since he is the author, but since this is on my fork, I may as well do them. Thanks Zach.

@xkoredev xkoredev force-pushed the kore/lsb-cherry-pick-latent-cp branch from 61b6b36 to 7203cdb Compare October 30, 2023 05:09
* Checks for destination region when zoning, to avoid issues with latent effects not triggering
* Fixes log spam for players in these non conquest but still latent applying regions
@xkoredev xkoredev force-pushed the kore/lsb-cherry-pick-latent-cp branch from 7203cdb to bf5e93a Compare October 30, 2023 05:14
@xkoredev
Copy link
Contributor Author

Tested on my local LSB seems to all work as intended. Zoning into a zone without conquest, zoning into sea, etc.

@zach2good zach2good removed the hold On hold, pending further action/info label Nov 21, 2023
@zach2good zach2good merged commit 47ef443 into LandSandBoat:base Nov 21, 2023
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

🐛 [xi_map] logging error "Invalid conquest region passed to function"
3 participants