Added support for location based placeholders with the custom placeho…

…lders registered using the PlaceholdersService
BG-Software-LLC · Jul 2, 2022 · 1671a52 · 1671a52
1 parent 121ace1
commit 1671a52
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/...in/java/com/bgsoftware/superiorskyblock/service/placeholders/PlaceholdersServiceImpl.java b/...in/java/com/bgsoftware/superiorskyblock/service/placeholders/PlaceholdersServiceImpl.java
@@ -41,6 +41,7 @@ public class PlaceholdersServiceImpl implements PlaceholdersService {
 
     private static final Pattern ISLAND_PLACEHOLDER_PATTERN = Pattern.compile("island_(.+)");
     private static final Pattern PLAYER_PLACEHOLDER_PATTERN = Pattern.compile("player_(.+)");
+    private static final Pattern LOCATION_PLACEHOLDER_PATTERN = Pattern.compile("location_(.+)");
     private static final Pattern PERMISSION_PLACEHOLDER_PATTERN = Pattern.compile("island_permission_(.+)");
     private static final Pattern UPGRADE_PLACEHOLDER_PATTERN = Pattern.compile("island_upgrade_(.+)");
     private static final Pattern COUNT_PLACEHOLDER_PATTERN = Pattern.compile("island_count_(.+)");
@@ -236,20 +237,25 @@ public String handlePluginPlaceholder(@Nullable OfflinePlayer offlinePlayer, Str
 
         Optional<String> placeholderResult = Optional.empty();
 
+        Matcher matcher;
+
         if (superiorPlayer != null) {
             PlayerPlaceholderParser customPlayerParser = CUSTOM_PLAYER_PARSERS.get(placeholder);
             if (customPlayerParser != null) {
                 placeholderResult = Optional.ofNullable(customPlayerParser.apply(superiorPlayer));
             } else {
-                IslandPlaceholderParser customIslandParser = CUSTOM_ISLAND_PARSERS.get(placeholder);
-                if (customIslandParser != null)
-                    placeholderResult = Optional.ofNullable(customIslandParser.apply(superiorPlayer.getIsland(), superiorPlayer));
+                boolean isLocationPlaceholder = placeholder.startsWith("location_");
+                IslandPlaceholderParser customIslandParser = CUSTOM_ISLAND_PARSERS.get(
+                        isLocationPlaceholder ? placeholder.substring(9) : placeholder);
+                if (customIslandParser != null) {
+                    Island island = isLocationPlaceholder ? plugin.getGrid().getIslandAt(superiorPlayer.getLocation()) :
+                            superiorPlayer.getIsland();
+                    placeholderResult = Optional.ofNullable(customIslandParser.apply(island, superiorPlayer));
+                }
             }
         }
 
         if (!placeholderResult.isPresent()) {
-            Matcher matcher;
-
             if ((matcher = PLAYER_PLACEHOLDER_PATTERN.matcher(placeholder)).matches()) {
                 String subPlaceholder = matcher.group(1).toLowerCase(Locale.ENGLISH);
                 placeholderResult = parsePlaceholdersForPlayer(superiorPlayer, subPlaceholder);