GH-266 New features for Trident and Pearls#303

Merged

vLuckyyy merged 28 commits into

EternalCodeTeam:masterfrom

Pawelusze:feature/add-reset-timer

Jun 7, 2026

Commits on Jun 7, 2026

I've added new options to Pearl and Trident that reset the timer when we use them

Pawelusze
authored and
Rollczi
committed
I made the corrections that gemini noticed

Pawelusze
authored and
Rollczi
committed
The improvements suggested by the team have been implemented

Pawelusze
authored and
Rollczi
committed
Implemented suggestions from the team

Pawelusze
authored and
Rollczi
committed
Make tridents throw check work on all tridents, regardless of enchantment

Jakubk15
authored and
Rollczi
committed
Implemented suggestions from the team and fixed `FightTridentController` logic

Pawelusze
authored and
Rollczi
committed
Corrected comments and field names

Pawelusze
authored and
Rollczi
committed
Implemented CitralFlo suggestions

Pawelusze
authored and
Rollczi
committed
Implemented CitralFlo suggestions again

Pawelusze
authored and
Rollczi
committed
Follow igoyek's review from 21.10.25

CitralFlo
authored and
Rollczi
committed
CR
Rollczi
committed
Simplify naming - extract logic to service for Pearls

CitralFlo
authored and
Rollczi
committed
make it more logical

CitralFlo
authored and
Rollczi
committed
Refactor trident-related classes and services for improved clarity and consistency

CitralFlo
authored and
Rollczi
committed
Rename trident cooldown methods to improve clarity and update comments for riptide usage

CitralFlo
authored and
Rollczi
committed
Fixes after tests - everything should be working now!

CitralFlo
authored and
Rollczi
committed
Remove commented line

CitralFlo
authored and
Rollczi
committed
Add cooldown to enderpearl - hack by:https://www.spigotmc.org/threads/modify-vanilla-ender-pearl-cooldown.629232/

CitralFlo
authored and
Rollczi
committed
Bump minecraft version in runServer task to 1.21.11

Jakubk15
authored and
Rollczi
committed
Add combat restrictions for Riptide tridents and improve event handling

vLuckyyy
authored and
Rollczi
committed
Update eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/trident/TridentSettings.java

Jakubk15
authored and
Rollczi
committed
Apply suggestion from @Jakubk15

Jakubk15
authored and
Rollczi
committed
Migrate to commons delay

Jakubk15
authored and
Rollczi
committed
Resolve conflicts

Jakubk15
authored and
Rollczi
committed
CR
Rollczi
committed
Merge branch 'master' into fork/Pawelusze/feature/add-reset-timer
Rollczi
committed
resolve merge
Rollczi
committed
resolve merge conflicts and update
Rollczi
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

GH-266 New features for Trident and Pearls#303

GH-266 New features for Trident and Pearls#303
vLuckyyy merged 28 commits into
EternalCodeTeam:masterfrom
Pawelusze:feature/add-reset-timer

Commits on Jun 7, 2026

I've added new options to Pearl and Trident that reset the timer when we use them

I made the corrections that gemini noticed

The improvements suggested by the team have been implemented

Implemented suggestions from the team

Make tridents throw check work on all tridents, regardless of enchantment

Implemented suggestions from the team and fixed `FightTridentController` logic

Corrected comments and field names

Implemented CitralFlo suggestions

Implemented CitralFlo suggestions again

Follow igoyek's review from 21.10.25

CR

Simplify naming - extract logic to service for Pearls

make it more logical

Refactor trident-related classes and services for improved clarity and consistency

Rename trident cooldown methods to improve clarity and update comments for riptide usage

Fixes after tests - everything should be working now!

Remove commented line

Add cooldown to enderpearl - hack by:https://www.spigotmc.org/threads/modify-vanilla-ender-pearl-cooldown.629232/

Bump minecraft version in runServer task to 1.21.11

Add combat restrictions for Riptide tridents and improve event handling

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

Apply suggestion from @Jakubk15

Migrate to commons delay

Resolve conflicts

CR

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

resolve merge

resolve merge conflicts and update