From 612683f728cd8ed23bba5ea369bdbdf9b4195427 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 17 Aug 2019 13:27:13 +0200 Subject: [PATCH] Removed the legacy placeholder format for gamemode default placeholders --- .../bentobox/bentobox/managers/PlaceholdersManager.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java b/src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java index 86716415d..df1ddc25b 100644 --- a/src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java @@ -71,15 +71,6 @@ public class PlaceholdersManager { Arrays.stream(GameModePlaceholder.values()) .filter(placeholder -> !isPlaceholder(addon, placeholder.getPlaceholder())) .forEach(placeholder -> registerPlaceholder(addon, placeholder.getPlaceholder(), new DefaultPlaceholder(addon, placeholder))); - - // TODO legacy placeholders, do not forget to remove at some point - String prefix = addon.getDescription().getName().toLowerCase(); - Map placeholders = new EnumMap<>(GameModePlaceholder.class); - Arrays.stream(GameModePlaceholder.values()).forEach(placeholder -> placeholders.put(placeholder, prefix + "-" + placeholder.getPlaceholder().replace('_', '-'))); - - // Register placeholders only if they have not already been registered by the addon itself - placeholders.entrySet().stream().filter(en -> !isPlaceholder(addon, en.getValue())) - .forEach(en -> registerPlaceholder(en.getValue(), new DefaultPlaceholder(addon, en.getKey()))); } /**