From 0592677c4d5b9697da37b01ee9df733e6b9a555a Mon Sep 17 00:00:00 2001 From: BlitzOffline <52609756+BlitzOffline@users.noreply.github.com> Date: Tue, 18 Apr 2023 00:25:30 +0300 Subject: [PATCH] Clear old MiniPlaceholders on config reload --- .../chatchat/api/placeholder/MiniPlaceholderManager.java | 5 +++++ .../main/java/at/helpch/chatchat/config/ConfigManager.java | 1 + .../chatchat/placeholder/MiniPlaceholderManagerImpl.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/at/helpch/chatchat/api/placeholder/MiniPlaceholderManager.java b/api/src/main/java/at/helpch/chatchat/api/placeholder/MiniPlaceholderManager.java index 4dd06589..d2e98c27 100644 --- a/api/src/main/java/at/helpch/chatchat/api/placeholder/MiniPlaceholderManager.java +++ b/api/src/main/java/at/helpch/chatchat/api/placeholder/MiniPlaceholderManager.java @@ -34,4 +34,9 @@ public interface MiniPlaceholderManager { * @return An unmodifiable {@link Set} of all registered {@link MiniPlaceholder}s. */ @NotNull Set<@NotNull MiniPlaceholder> placeholders(); + + /** + * Clears all placeholders. + */ + public void clear(); } diff --git a/plugin/src/main/java/at/helpch/chatchat/config/ConfigManager.java b/plugin/src/main/java/at/helpch/chatchat/config/ConfigManager.java index 30d8ebe2..86a10b0e 100644 --- a/plugin/src/main/java/at/helpch/chatchat/config/ConfigManager.java +++ b/plugin/src/main/java/at/helpch/chatchat/config/ConfigManager.java @@ -56,6 +56,7 @@ public void reload() { ChatFormat.defaultFormat(defaultFormat); miniPlaceholders(); + plugin.miniPlaceholdersManager().clear(); miniPlaceholders.placeholders().forEach(placeholder -> plugin.miniPlaceholdersManager().addPlaceholder(placeholder)); } diff --git a/plugin/src/main/java/at/helpch/chatchat/placeholder/MiniPlaceholderManagerImpl.java b/plugin/src/main/java/at/helpch/chatchat/placeholder/MiniPlaceholderManagerImpl.java index e82af3c0..772fa544 100644 --- a/plugin/src/main/java/at/helpch/chatchat/placeholder/MiniPlaceholderManagerImpl.java +++ b/plugin/src/main/java/at/helpch/chatchat/placeholder/MiniPlaceholderManagerImpl.java @@ -36,7 +36,7 @@ public void addPlaceholder(@NotNull final MiniPlaceholder placeholder) { return Collections.unmodifiableSet(miniPlaceholders); } - private void clear() { + public void clear() { miniPlaceholders.clear(); } }