The improvements suggested by the team have been implemented

Author: Pawelusze

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

@@ -68,9 +68,9 @@ public void onPearlThrow(ProjectileLaunchEvent event) {
             handlePearlCooldown(event, player, playerId);
         }
 
-        if (this.settings.pearlResetsTimerEnabled) {
+        if (this.settings.pearlResetsTimer) {
             Duration combatTime = this.config.settings.combatTimerDuration;
-            this.fightManager.tag(playerId, combatTime, CauseOfTag.CUSTOM);
+            this.fightManager.tag(playerId, combatTime, CauseOfTag.NON_PLAYER);
         }
     }
 

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

@@ -22,7 +22,7 @@ public class FightPearlSettings extends OkaeriConfig {
     public boolean pearlCooldownEnabled = false;
 
     @Comment("# Set true, If you want to reset timer when player throws ender pearl")
-    public boolean pearlResetsTimerEnabled = true;
+    public boolean pearlResetsTimer = true;
 
     @Comment({
         "# Block throwing pearls with delay?",

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

@@ -7,12 +7,15 @@
 import com.eternalcode.combat.notification.NoticeService;
 import com.eternalcode.combat.util.DurationUtil;
 import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerRiptideEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 
 import java.time.Duration;
 import java.util.UUID;
@@ -39,7 +42,6 @@ public FightTridentController(
         this.config = config;
     }
 
-
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onTridentInteract(PlayerInteractEvent event) {
         ItemStack item = event.getItem();
@@ -48,6 +50,10 @@ public void onTridentInteract(PlayerInteractEvent event) {
             return;
         }
 
+        if (!item.hasItemMeta() || !item.getItemMeta().hasEnchant(Enchantment.RIPTIDE)) {
+            return;
+        }
+
         Player player = event.getPlayer();
         UUID playerId = player.getUniqueId();
 
@@ -67,10 +73,20 @@ public void onTridentInteract(PlayerInteractEvent event) {
         if (this.settings.tridentCooldownEnabled) {
             this.handleTridentCooldown(event, player, playerId);
         }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onTridentRiptide(PlayerRiptideEvent event) {
+        Player player = event.getPlayer();
+        UUID playerId = player.getUniqueId();
+
+        if (!this.fightManager.isInCombat(playerId)) {
+            return;
+        }
 
-        if (this.settings.tridentResetsTimerEnabled) {
+        if (this.settings.tridentResetsTimer) {
             Duration combatTime = this.config.settings.combatTimerDuration;
-            this.fightManager.tag(playerId, combatTime, CauseOfTag.CUSTOM);
+            this.fightManager.tag(playerId, combatTime, CauseOfTag.NON_PLAYER);
         }
     }
 

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

@@ -2,19 +2,20 @@
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
 import java.time.Instant;
 import java.util.UUID;
 
 public class FightTridentServiceImpl implements FightTridentService {
     private final FightTridentSettings tridentSettings;
-    private final Cache<UUID, Instant> tridentStartTimes;
+    private final Cache<@NotNull UUID, Instant> tridentStartTimes;
 
-    public FightTridentServiceImpl(FightTridentSettings pearlSettings) {
-        this.tridentSettings = pearlSettings;
+    public FightTridentServiceImpl(FightTridentSettings tridentSettings) {
+        this.tridentSettings = tridentSettings;
         this.tridentStartTimes = Caffeine.newBuilder()
-            .expireAfterWrite(pearlSettings.tridentThrowDelay)
+            .expireAfterWrite(tridentSettings.tridentThrowDelay)
             .build();
     }
 

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

@@ -10,29 +10,29 @@
 public class FightTridentSettings extends OkaeriConfig {
 
     @Comment({
-        "# Set true, If you want to disable throwing trident during combat",
+        "# Set to true to disable throwing tridents during combat.",
         "# This will work globally, but can be overridden by region settings"
     })
-    public boolean tridentThrowDisabledDuringCombat = true;
+    public boolean tridentThrowDisabledDuringCombat = false;
 
-    @Comment("# Set true, If you want add cooldown to trident")
+    @Comment("# Set to true so throwing trident will result in cooldown - delay between throws")
     public boolean tridentCooldownEnabled = false;
 
-    @Comment("# Set true, If you want to reset timer when player uses trident")
-    public boolean tridentResetsTimerEnabled = true;
+    @Comment("# Set to true, so the users will get combat log when they throw tridents")
+    public boolean tridentResetsTimer = false;
 
     @Comment({
-        "# Block throwing trident with delay?",
-        "# If you set this to for example 3s, player will have to wait 3 seconds before throwing trident"
+        "# Should throwing trident be on cooldown?",
+        "# Setting this option to 3s will make players wait 3 seconds between trident throws"
     })
     public Duration tridentThrowDelay = Duration.ofSeconds(3);
 
-    @Comment("# Message sent when player tries to throw trident, but are disabled")
+    @Comment("# Message sent to the player when throwing trident is disabled")
     public Notice tridentThrowBlockedDuringCombat = BukkitNotice.builder()
         .chat("<red>Throwing trident is prohibited during combat!")
         .build();
 
-    @Comment("# Message sent when player tries to throw trident, but has delay")
+    @Comment("# Message marking delay between trident throws")
     public Notice tridentThrowBlockedDelayDuringCombat = BukkitNotice.builder()
         .chat("<red>You must wait {TIME} before next throw!")
         .build();