GH-227 Sort combat regions by priority which supports overlapping regions in knockback feature by CitralFlo · Pull Request #227 · EternalCodeTeam/EternalCombat

CitralFlo · 2025-05-28T08:14:23Z

Sorting mechanism does not work for border, particles and delayed knockback

… knockback feature Took 1 hour 18 minutes

… knockback feature Took 1 hour 18 minutes Took 15 seconds

coderabbitai · 2025-05-28T08:14:29Z

Walkthrough

The change refactors how the code finds a region for a given location. It adds a new method that picks the region with the highest priority from a set of applicable regions. The main method now uses this helper to return the top-priority combat region if one exists, or nothing if none do. This replaces the old approach that returned the first combat region found during iteration.

✨ Finishing Touches

📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d6bf4e6 and 68f2bb2.

📒 Files selected for processing (1)

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java (3 hunks)

🔇 Additional comments (1)

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java (1)

36-51: Nice refactoring!

The updated method is cleaner and easier to follow by delegating the priority logic to a helper method.

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java

Took 9 minutes

Took 4 minutes

coderabbitai

Actionable comments posted: 0

♻️ Duplicate comments (1)

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java (1)
125-125: ⚠️ Potential issue

Critical bug: Still sorting by lowest priority instead of highest!

The sorting bug from previous reviews is still present. You're sorting in ascending order and taking the first element, which gives the lowest priority region, not the highest.

Fix this by reversing the sort order:
-            .sorted(Comparator.comparingInt(ProtectedRegion::getPriority))
+            .sorted(Comparator.comparingInt(ProtectedRegion::getPriority).reversed())

🧹 Nitpick comments (1)

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java (1)
111-111: Consider making this method private.

The method doesn't need package visibility since it's only used internally.
-    ProtectedRegion highestPriorityRegion(ApplicableRegionSet applicableRegions) {
+    private ProtectedRegion highestPriorityRegion(ApplicableRegionSet applicableRegions) {

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ff806b8 and ae86d48.

📒 Files selected for processing (1)

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java (3 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (1)

GitHub Check: build

🔇 Additional comments (2)

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java (2)

16-18: Import additions look good.

The new imports for Comparator and Set support the priority-based sorting functionality.

41-49: Good refactor to use priority-based selection.

The logic change to use the new helper method makes the code cleaner and implements the priority-based region selection as intended.

CitralFlo added 3 commits May 28, 2025 10:12

Sort combat regions by priority which supports overlapping regions in…

8c7d1b4

… knockback feature Took 1 hour 18 minutes

Sort combat regions by priority which supports overlapping regions in…

253356e

… knockback feature Took 1 hour 18 minutes Took 15 seconds

Merge remote-tracking branch 'origin/priority-sort' into priority-sort

68f2bb2

CitralFlo changed the title ~~Sort combat regions by priority which supports overlapping regions in knockback feature~~ GH-227 Sort combat regions by priority which supports overlapping regions in knockback feature May 28, 2025

CitralFlo requested review from Jakubk15, P1otrulla, Rollczi, igoyek, imDMK and vLuckyyy May 28, 2025 08:15

coderabbitai bot suggested changes May 28, 2025

View reviewed changes

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java Show resolved Hide resolved

imDMK reviewed May 28, 2025

View reviewed changes

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java Outdated Show resolved Hide resolved

Jakubk15 approved these changes Jun 6, 2025

View reviewed changes

eternalcombat-plugin/src/main/java/com/eternalcode/combat/region/WorldGuardRegionProvider.java Show resolved Hide resolved

Resolve DMK and jakubek review's

ff806b8

Took 9 minutes

CitralFlo requested a review from imDMK June 10, 2025 14:37

coderabbitai bot approved these changes Jun 10, 2025

View reviewed changes

vLuckyyy approved these changes Jun 10, 2025

View reviewed changes

Correct priority

ae86d48

Took 4 minutes

coderabbitai bot reviewed Jun 10, 2025

View reviewed changes

CitralFlo merged commit f9bc56b into master Jun 10, 2025
2 checks passed

CitralFlo deleted the priority-sort branch June 10, 2025 14:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

GH-227 Sort combat regions by priority which supports overlapping regions in knockback feature#227

GH-227 Sort combat regions by priority which supports overlapping regions in knockback feature#227
CitralFlo merged 5 commits intomasterfrom
priority-sort

CitralFlo commented May 28, 2025

Uh oh!

coderabbitai bot commented May 28, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

CitralFlo commented May 28, 2025

Uh oh!

coderabbitai bot commented May 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

coderabbitai bot commented May 28, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)