GH-266 New features for Trident and Pearls by Pawelusze · Pull Request #303 · EternalCodeTeam/EternalCombat

Pawelusze · 2025-12-14T19:45:04Z

I've added new options to Pearl and Trident that reset the timer when the player uses them.

… we use them

gemini-code-assist · 2025-12-14T19:45:27Z

Summary of Changes

Hello @Pawelusze, I'm Gemini Code Assist¹! 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 significantly expands the combat system by introducing new, highly configurable mechanics for both Ender Pearls and Tridents. The core addition is the ability to reset a player's combat timer when they throw an Ender Pearl or use a Trident, providing more dynamic and strategic combat scenarios. Furthermore, it establishes a comprehensive set of combat-specific settings for Tridents, including options to restrict their use during combat and implement cooldowns, aligning them with existing pearl-related features.

Highlights

Trident Combat Mechanics: Introduced new combat-related features for tridents, including options to disable throwing during combat, apply cooldowns, and reset the combat timer upon use.
Pearl Combat Timer Reset: Added a new configurable option to reset a player's combat timer when they throw an Ender Pearl, enhancing combat engagement.
Enhanced Configurability: All new trident and pearl timer reset functionalities are fully configurable via the PluginConfig, allowing server administrators to tailor combat behavior.

Using Gemini Code Assist

The 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 /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

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 .gemini/ folder in the base of the repository. Detailed instructions can be found here.

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.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request introduces new features for handling tridents in combat and adds an option to reset the combat timer upon using ender pearls or tridents. The implementation is largely correct, but I've identified a critical issue: the fightTridentService is used without being initialized, which will lead to a NullPointerException. I've also found several copy-paste errors in the new trident-related classes, including incorrect naming and comments that refer to 'pearls' instead of 'tridents'. My review includes suggestions to fix these issues to ensure the code is correct and maintainable. Additionally, I've pointed out an unused import that should be removed.

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

...combat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentController.java

...ombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentServiceImpl.java

...alcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentSettings.java

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/FightPearlController.java

...ombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentServiceImpl.java

...combat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentController.java

CitralFlo

Resolve reviews and the Riptide issue mentioned by Jakubek

...ombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentServiceImpl.java

...alcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentSettings.java

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/FightPearlSettings.java

igoyek

Follow friend's instructions :)

…ment

Jakubk15 · 2025-12-29T20:25:37Z

Add right-click check to inflict the cooldown only on throw, not on melee attack

eternalcombat-plugin/src/main/java/com/eternalcode/combat/CombatPlugin.java

CitralFlo · 2025-12-30T09:31:54Z

Also closes: #296

…ature/add-reset-timer

…er` logic

...alcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentSettings.java

...combat-plugin/src/main/java/com/eternalcode/combat/fight/trident/FightTridentController.java

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentController.java

CitralFlo · 2026-02-03T22:20:39Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentController.java

+            return;
+        }
+
+        if (this.pluginConfig.trident.tridentRiptideDisabledDuringCombat) {


this could be higher before isInCombat - when the option is disable we dont need to check if the players is in combat

Exactly, so why is this marked as resolved? #303 (comment)

CitralFlo

Would be cool if @Rollczi could take a look at reloading the plugin - cache settings thing. Ref needed but using supplier in my case did not work.

…d consistency

…s for riptide usage

CitralFlo · 2026-02-07T23:44:45Z

@Jakubk15 re-review requested due to massive changes

…/modify-vanilla-ender-pearl-cooldown.629232/

Jakubk15

https://streamable.com/prq6pq Trident cooldown still applies when leaving combat. Up to you if you want to clear it after combat tag has passed.

Jakubk15 · 2026-02-08T10:26:30Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/util/delay/Delay.java

+import java.time.Instant;
+import java.util.function.Supplier;
+
+public class Delay<T> {


How about we wait until GH-76/EternalCodeCommons is merged first?

Jakubk15 · 2026-02-08T10:28:21Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentController.java

+            return;
+        }
+
+        if (this.pluginConfig.trident.tridentRiptideDisabledDuringCombat) {


Exactly, so why is this marked as resolved? #303 (comment)

Jakubk15 · 2026-02-08T10:30:59Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentController.java

+        if (this.tridentService.hasDelay(uniqueId)) {
+            Duration remainingDelay = this.tridentService.getRemainingDelay(uniqueId);
+
+            this.noticeService.create()
+                .player(uniqueId)
+                .notice(this.pluginConfig.trident.tridentRiptideOnCooldown)
+                .placeholder("{TIME}", DurationUtil.format(remainingDelay))
+                .send();
+
+            return;
+        }


Is this code reachable? Is it possible to somehow bypass the vanilla delay? Do cheat clients have that feature? Looks like dead code to me, but feel free to reproduce.

Jakubk15 · 2026-02-08T10:53:34Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentServiceImpl.java

+        if (this.pluginConfig.trident.tridentRiptideDelay.isZero()) {
+            return;
+        }


Move this to the top perhaps?

Jakubk15 · 2026-02-08T10:53:45Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentSettings.java

+    public boolean riptideResetsTimerEnabled = false;
+
+    @Comment({
+        "# Should riptide enchantment be on cooldown?",


Suggested change

"# Should riptide enchantment be on cooldown?",

"# Should riptide enchantment be on cooldown during combat?",

Jakubk15 · 2026-02-08T10:54:36Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentSettings.java

+    @Comment({
+        "# Message sent to the player when riptide is on cooldown",
+        "# Available placeholder: {TIME} - remaining time left to use riptide again"
+    })
+    public Notice tridentRiptideOnCooldown = BukkitNotice.builder()
+        .chat("<red>You must wait {TIME} before next riptide!")
+        .build();
+}


potential dead code

Jakubk15 · 2026-02-08T10:56:22Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentController.java

+
+        if (event.getFrom().distanceSquared(event.getTo()) == 0) {
+            return;
+        }


Can we maybe improve this check?

2026-02-08.11-51-08.mp4

I saw it once! And couldn't reproduce it, do You have any tip how?

I can add a version check. For versions ≥1.21.4, I'll use standard event cancellation. For versions <1.21.4, I'll fall back to the current method, as it appears to be the only working way to block Riptide for versions below 1.21.4. If someone knows a better way to handle the fallback, feel free to suggest it.

Jakubk15 · 2026-02-11T18:10:38Z

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentSettings.java

+    @Comment({
+        "# Should riptide enchantment be on cooldown?",
+        "# Setting this option to 3s will make players wait 3 seconds between trident throws",
+        "# Setting this to 0s will remove cooldown"


Suggested change

"# Setting this to 0s will remove cooldown"

"# Setting this to 0s or below will remove cooldown"

I've added new options to Pearl and Trident that reset the timer when…

3fa5bfa

… we use them

gemini-code-assist bot reviewed Dec 14, 2025

View reviewed changes

Pawelusze changed the title ~~I've added new options to Pearl and Trident that reset the timer when…~~ GH-303 New feature to trident and pearls Dec 14, 2025

Pawelusze changed the title ~~GH-303 New feature to trident and pearls~~ GH-303 New feature for trident and pearls Dec 14, 2025

Pawelusze changed the title ~~GH-303 New feature for trident and pearls~~ GH-303 New features for Trident and Pearls Dec 14, 2025

I made the corrections that gemini noticed

fa7e220

Pawelusze requested review from CitralFlo, Jakubk15, igoyek and vLuckyyy December 14, 2025 20:07

Jakubk15 linked an issue Dec 14, 2025 that may be closed by this pull request

Ender Pearl & Trident Combat Reset #266

Open

Jakubk15 changed the title ~~GH-303 New features for Trident and Pearls~~ GH-266 New features for Trident and Pearls Dec 14, 2025

Jakubk15 requested changes Dec 14, 2025

View reviewed changes

CitralFlo requested changes Dec 19, 2025

View reviewed changes

igoyek reviewed Dec 21, 2025

View reviewed changes

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/pearl/FightPearlSettings.java Outdated Show resolved Hide resolved

igoyek approved these changes Dec 21, 2025

View reviewed changes

Pawelusze added 2 commits December 29, 2025 20:23

The improvements suggested by the team have been implemented

e48a01f

Implemented suggestions from the team

f4bdbb7

Jakubk15 force-pushed the feature/add-reset-timer branch from f4bdbb7 to e48a01f Compare December 29, 2025 19:38

Pawelusze requested review from CitralFlo and Jakubk15 December 29, 2025 19:42

Jakubk15 added 2 commits December 29, 2025 21:17

Bump packetevents version to support future MC versions

51d4e34

Make tridents throw check work on all tridents, regardless of enchant…

2e899de

…ment

Jakubk15 approved these changes Dec 29, 2025

View reviewed changes

CitralFlo requested changes Dec 30, 2025

View reviewed changes

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

Pawelusze added 2 commits January 4, 2026 08:10

Merge remote-tracking branch 'origin/feature/add-reset-timer' into fe…

0be6867

…ature/add-reset-timer

Implemented suggestions from the team and fixed `FightTridentControll…

ab4e804

…er` logic

Pawelusze force-pushed the feature/add-reset-timer branch from 36cf3cb to ab4e804 Compare February 2, 2026 19:47

Pawelusze requested a review from CitralFlo February 2, 2026 19:57

Corrected comments and field names

5ec350a

CitralFlo requested changes Feb 3, 2026

View reviewed changes

Implemented CitralFlo suggestions

ee6cac5

Pawelusze requested a review from CitralFlo February 4, 2026 15:51

Implemented CitralFlo suggestions again

68fb2ef

Pawelusze force-pushed the feature/add-reset-timer branch from e41590e to 68fb2ef Compare February 5, 2026 21:17

CitralFlo and others added 2 commits February 6, 2026 23:07

Merge branch 'master' into feature/add-reset-timer

5efe39b

Follow igoyek's review from 21.10.25

0841c22

CitralFlo approved these changes Feb 7, 2026

View reviewed changes

Rollczi and others added 5 commits February 7, 2026 22:57

CR

76e84ab

Simplify naming - extract logic to service for Pearls

07ab306

make it more logical

795c7b6

Refactor trident-related classes and services for improved clarity an…

984449b

…d consistency

Rename trident cooldown methods to improve clarity and update comment…

3b0bd15

…s for riptide usage

CitralFlo requested review from Jakubk15 and igoyek and removed request for igoyek February 7, 2026 23:44

CitralFlo and others added 4 commits February 8, 2026 01:21

Fixes after tests - everything should be working now!

486789d

Remove commented line

70b3c7b

Add cooldown to enderpearl - hack by:https://www.spigotmc.org/threads…

996e95c

…/modify-vanilla-ender-pearl-cooldown.629232/

Bump minecraft version in runServer task to 1.21.11

3b19294

Jakubk15 requested changes Feb 8, 2026

View reviewed changes

Jakubk15 reviewed Feb 11, 2026

View reviewed changes

	"# Should riptide enchantment be on cooldown?",
	"# Should riptide enchantment be on cooldown during combat?",

	"# Setting this to 0s will remove cooldown"
	"# Setting this to 0s or below will remove cooldown"

Uh oh!

Conversation

Pawelusze commented Dec 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist bot commented Dec 14, 2025

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CitralFlo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

igoyek left a comment

Choose a reason for hiding this comment

Uh oh!

Jakubk15 commented Dec 29, 2025

Uh oh!

Uh oh!

CitralFlo commented Dec 30, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jakubk15 Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CitralFlo left a comment

Choose a reason for hiding this comment

Uh oh!

CitralFlo commented Feb 7, 2026

Uh oh!

Jakubk15 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jakubk15 Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Pawelusze commented Dec 14, 2025 •

edited

Loading

Jakubk15 Feb 8, 2026 •

edited

Loading

Jakubk15 Feb 8, 2026 •

edited

Loading