use EMPTY ActionApplier on RequirementSet

BetterGUI-MC · Feb 24, 2024 · c5a6042 · c5a6042
1 parent 885a122
commit c5a6042
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/me/hsgamer/bettergui/requirement/RequirementSet.java b/src/main/java/me/hsgamer/bettergui/requirement/RequirementSet.java
@@ -40,8 +40,12 @@ public RequirementSet(Menu menu, String name, Map<String, Object> section) {
     }).collect(Collectors.toList());
 
     Map<String, Object> keys = new CaseInsensitiveStringMap<>(section);
-    this.successActionApplier = new ActionApplier(menu, MapUtils.getIfFoundOrDefault(keys, Collections.emptyList(), "success-command", "success-action"));
-    this.failActionApplier = new ActionApplier(menu, MapUtils.getIfFoundOrDefault(keys, Collections.emptyList(), "fail-command", "fail-action"));
+    this.successActionApplier = Optional.ofNullable(MapUtils.getIfFound(keys, "success-command", "success-action"))
+      .map(o -> new ActionApplier(menu, o))
+      .orElse(ActionApplier.EMPTY);
+    this.failActionApplier = Optional.ofNullable(MapUtils.getIfFound(keys, "fail-command", "fail-action"))
+      .map(o -> new ActionApplier(menu, o))
+      .orElse(ActionApplier.EMPTY);
   }
 
   /**