From 748bcc0db6a5d015667edd4335f091146e4780b0 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <972454774@qq.com>
Date: Sat, 30 Dec 2023 18:42:49 +0800
Subject: [PATCH] fix &m

---
 .../customfishing/adventure/AdventureManagerImpl.java      | 2 +-
 .../customfishing/mechanic/action/ActionManagerImpl.java   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugin/src/main/java/net/momirealms/customfishing/adventure/AdventureManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/adventure/AdventureManagerImpl.java
index 8268dd8a..920d24fd 100644
--- a/plugin/src/main/java/net/momirealms/customfishing/adventure/AdventureManagerImpl.java
+++ b/plugin/src/main/java/net/momirealms/customfishing/adventure/AdventureManagerImpl.java
@@ -183,7 +183,7 @@ public class AdventureManagerImpl implements AdventureManager {
                 case 'f' -> stringBuilder.append("<white>");
                 case 'r' -> stringBuilder.append("<r><!i>");
                 case 'l' -> stringBuilder.append("<b>");
-                case 'm' -> stringBuilder.append("<s>");
+                case 'm' -> stringBuilder.append("<st>");
                 case 'o' -> stringBuilder.append("<i>");
                 case 'n' -> stringBuilder.append("<u>");
                 case 'k' -> stringBuilder.append("<o>");
diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java
index 2774c4b3..985ed71a 100644
--- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java
+++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/action/ActionManagerImpl.java
@@ -156,7 +156,6 @@ public class ActionManagerImpl implements ActionManager {
      * @return An Action object created based on the configuration, or an EmptyAction instance if the action type is invalid.
      */
     @Override
-    @NotNull
     public Action getAction(ConfigurationSection section) {
         ActionFactory factory = getActionFactory(section.getString("type"));
         if (factory == null) {
@@ -223,7 +222,9 @@ public class ActionManagerImpl implements ActionManager {
         // Iterate through all key-value pairs in the ConfigurationSection
         for (Map.Entry<String, Object> entry : section.getValues(false).entrySet()) {
             if (entry.getValue() instanceof ConfigurationSection innerSection) {
-                actionList.add(getAction(innerSection));
+                Action action = getAction(innerSection);
+                if (action != null)
+                    actionList.add(action);
             }
         }
         return actionList.toArray(new Action[0]);
@@ -629,7 +630,7 @@ public class ActionManagerImpl implements ActionManager {
                 return condition -> {
                     if (Math.random() > chance) return;
                     Player player = condition.getPlayer();
-                    ItemUtils.giveCertainAmountOfItem(player, CustomFishingPlugin.get().getItemManager().buildAnyPluginItemByID(player, id), amount);
+                    ItemUtils.giveCertainAmountOfItem(player, Objects.requireNonNull(CustomFishingPlugin.get().getItemManager().buildAnyPluginItemByID(player, id)), amount);
                 };
             } else {
                 LogUtils.warn("Illegal value format found at action: give-item");