diff --git a/src/main/java/net/momirealms/customnameplates/hook/NameplatePlaceholders.java b/src/main/java/net/momirealms/customnameplates/hook/NameplatePlaceholders.java index 4c644a7..39cc756 100644 --- a/src/main/java/net/momirealms/customnameplates/hook/NameplatePlaceholders.java +++ b/src/main/java/net/momirealms/customnameplates/hook/NameplatePlaceholders.java @@ -51,6 +51,11 @@ public class NameplatePlaceholders extends PlaceholderExpansion { return "1.1"; } + @Override + public boolean persist() { + return true; + } + @Override public String onRequest(OfflinePlayer player, String params) { if (params.equals("equipped")){ diff --git a/src/main/java/net/momirealms/customnameplates/hook/OffsetPlaceholders.java b/src/main/java/net/momirealms/customnameplates/hook/OffsetPlaceholders.java index 775aacd..e483019 100644 --- a/src/main/java/net/momirealms/customnameplates/hook/OffsetPlaceholders.java +++ b/src/main/java/net/momirealms/customnameplates/hook/OffsetPlaceholders.java @@ -21,6 +21,11 @@ public class OffsetPlaceholders extends PlaceholderExpansion { return "1.0"; } + @Override + public boolean persist() { + return true; + } + @Override public String onRequest(OfflinePlayer player, String params) { if (params == null) return null; diff --git a/src/main/java/net/momirealms/customnameplates/objects/TextCache.java b/src/main/java/net/momirealms/customnameplates/objects/TextCache.java index 2fa6542..89e0a07 100644 --- a/src/main/java/net/momirealms/customnameplates/objects/TextCache.java +++ b/src/main/java/net/momirealms/customnameplates/objects/TextCache.java @@ -44,12 +44,7 @@ public class TextCache { } private void analyze(String value) { - List placeholdersOwner = new ArrayList<>(); - for (String identifier : CustomNameplates.instance.getPlaceholderManager().detectPlaceholders(value)) { - if (!identifier.startsWith("%rel_")) { - placeholdersOwner.add(identifier); - } - } + List placeholdersOwner = new ArrayList<>(CustomNameplates.instance.getPlaceholderManager().detectPlaceholders(value)); String origin = value; for (String placeholder : placeholdersOwner) { origin = origin.replace(placeholder, "%s"); diff --git a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java index 1b1961b..8ac0937 100644 --- a/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java +++ b/src/main/java/net/momirealms/customnameplates/resource/ResourceManager.java @@ -530,7 +530,6 @@ public class ResourceManager { if (ConfigManager.Main.itemsAdder){ try { FileUtils.copyDirectory(generated, new File(Bukkit.getPluginManager().getPlugin("ItemsAdder").getDataFolder() + File.separator + "data"+ File.separator + "resource_pack" + File.separator + "assets") ); - AdventureUtil.consoleMessage("[CustomNameplates] Detected ItemsAdder! Automatically sent rp to ItemsAdder folder!"); } catch (IOException e){ e.printStackTrace(); @@ -540,7 +539,6 @@ public class ResourceManager { if (ConfigManager.Main.oraxen){ try { FileUtils.copyDirectory(new File(generated, File.separator + ConfigManager.Main.namespace), new File(Bukkit.getPluginManager().getPlugin("Oraxen").getDataFolder() + File.separator + "pack"+ File.separator + "assets" + File.separator + ConfigManager.Main.namespace)); - AdventureUtil.consoleMessage("[CustomNameplates] Detected Oraxen! Automatically sent rp to Oraxen folder!"); } catch (IOException e){ e.printStackTrace();