-
-
Notifications
You must be signed in to change notification settings - Fork 8
GH-304 Fix Folia enderpearl inflicting self damage on user #304
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
base: master
Are you sure you want to change the base?
Conversation
Took 2 minutes
Took 4 minutes
Took 23 minutes
Took 3 minutes
Took 15 minutes
Took 5 minutes
… to support folia. add folia runserver task Took 1 hour 6 minutes
Summary of ChangesHello @CitralFlo, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request primarily addresses a specific bug on Folia servers where enderpearl usage would erroneously trigger self-damage and combat tagging. Beyond the bug fix, it enhances the combat system by introducing configurable bypass mechanisms for administrators, creative mode players, and those with a designated permission, providing more granular control over combat tagging behavior. Additionally, it includes necessary dependency adjustments and build script updates to ensure compatibility and leverage newer plugin versions. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request fixes an issue where enderpearls could inflict self-damage on Folia servers, and refactors the combat bypass logic into separate, more maintainable controller classes. The changes look good, but I've found a critical issue with how UUIDs are compared, which could lead to bugs. I've also suggested a refactoring to reduce code duplication in the new bypass controllers.
...lcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightTagController.java
Outdated
Show resolved
Hide resolved
...plugin/src/main/java/com/eternalcode/combat/fight/controller/FightBypassAdminController.java
Show resolved
Hide resolved
…t/controller/FightTagController.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
|
Should be merged after: #302 |
| UUID attackedUniqueId = attackedPlayerByPerson.getUniqueId(); | ||
| UUID attackerUniqueId = attacker.getUniqueId(); | ||
|
|
||
| if (this.cannotBeTagged(attackedPlayerByPerson)) { | ||
| // enderpearl on folia counts as attack on self | ||
| if (attackedUniqueId.equals(attackerUniqueId)) { | ||
| return; | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume this won't only be the cause for Ender Pearls, right? The if condition will also be met when, for example, a player shoots an arrow into the air and it hits them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True, I couldn't figure out other scenarios.
The ender pearl scenario does not even contain the type / cause / source using bukkit methods. I will verify that and complete a fix.
Thanks for the scenario!
Co-authored-by: Jakub Kędziora <77227023+Jakubk15@users.noreply.github.com>
Reported via Discord.
