From e7f946b66229f32b7e51059bc996f16482ecf968 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <972454774@qq.com>
Date: Mon, 13 Nov 2023 16:34:55 +0800
Subject: [PATCH] fix competition rewards

---
 .../customfishing/mechanic/competition/Competition.java    | 7 ++-----
 .../mechanic/competition/CompetitionManagerImpl.java       | 4 +---
 .../customfishing/mechanic/fishing/FishingManagerImpl.java | 1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/Competition.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/Competition.java
index a4c3a143..ac817c03 100644
--- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/Competition.java
+++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/Competition.java
@@ -191,14 +191,11 @@ public class Competition implements FishingCompetition {
                 } else {
                     Action[] actions = rewardsMap.get("participation");
                     if (actions != null) {
-                        iterator.forEachRemaining(playerName -> {
-                            Player player = Bukkit.getPlayer(competitionPlayer.left());
+                        Player player = Bukkit.getPlayer(competitionPlayer.left()); {
                             if (player != null)
                                 for (Action action : actions)
                                     action.trigger(new Condition(player));
-                        });
-                    } else {
-                        break;
+                        }
                     }
                 }
             }
diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/CompetitionManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/CompetitionManagerImpl.java
index 74905853..1b6d5f89 100644
--- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/CompetitionManagerImpl.java
+++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/CompetitionManagerImpl.java
@@ -155,9 +155,7 @@ public class CompetitionManagerImpl implements CompetitionManager {
 
                 CompetitionConfig competitionConfig = builder.build();
                 List<Pair<Integer, Integer>> timePairs = section.getStringList("start-time")
-                        .stream().map(it -> {
-                            return ConfigUtils.splitStringIntegerArgs(it, ":");
-                        }).toList();
+                        .stream().map(it -> ConfigUtils.splitStringIntegerArgs(it, ":")).toList();
                 List<Integer> weekdays = section.getIntegerList("start-weekday");
                 if (weekdays.size() == 0) {
                     weekdays.addAll(List.of(1,2,3,4,5,6,7));
diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java
index 50405fdf..9bcc7910 100644
--- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java
+++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java
@@ -304,7 +304,6 @@ public class FishingManagerImpl implements Listener, FishingManager {
             removeTempFishingState(player);
             return;
         }
-        // Merge rod/bait/util effects
         FishingEffect initialEffect = plugin.getEffectManager().getInitialEffect();
         // Merge totem effects
         EffectCarrier totemEffect = plugin.getTotemManager().getTotemEffect(player.getLocation());