Fixed incorrect parsing of top-related placeholders (#845)

BG-Software-LLC · Jan 15, 2022 · 003ed9c · 003ed9c
1 parent 9612783
commit 003ed9c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/hooks/support/PlaceholderHook.java b/src/main/java/com/bgsoftware/superiorskyblock/hooks/support/PlaceholderHook.java
@@ -306,16 +306,16 @@ private static Optional<String> handleTopIslandsPlaceholder(Island island, Super
         } else if ((matcher = TOP_VALUE_PLACEHOLDER_PATTERN.matcher(placeholderValue)).matches()) {
             getValueFunction = targetIsland -> StringUtils.format(targetIsland.getWorth());
         } else if ((matcher = TOP_LEADER_PLACEHOLDER_PATTERN.matcher(placeholderValue)).matches()) {
+            getValueFunction = targetIsland -> targetIsland.getOwner().getName();
+        } else {
             getValueFunction = targetIsland -> targetIsland.getName().isEmpty() ?
                     targetIsland.getOwner().getName() : targetIsland.getName();
-        } else {
-            return Optional.empty();
         }
 
         int targetPosition;
 
         try {
-            targetPosition = Integer.parseInt(matcher.group(1));
+            targetPosition = Integer.parseInt(matcher.matches() ? matcher.group(1) : placeholderValue);
         } catch (NumberFormatException error) {
             return Optional.empty();
         }