From 190711e2b9fef957cf5de0366ce9bfd23f6e6cfc Mon Sep 17 00:00:00 2001 From: XiYang6666 <1782356858@qq.com> Date: Sat, 18 May 2024 20:21:19 +0800 Subject: [PATCH 1/2] feat(bukkit): support virtual host on paper --- .../java/xyz/jpenilla/minimotd/bukkit/PaperPingListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/PaperPingListener.java b/platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/PaperPingListener.java index 28ed9ad..5a21399 100644 --- a/platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/PaperPingListener.java +++ b/platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/PaperPingListener.java @@ -45,7 +45,7 @@ public final class PaperPingListener implements Listener { @EventHandler public void handlePing(final @NonNull PaperServerListPingEvent event) { - final MOTDConfig cfg = this.miniMOTD.configManager().mainConfig(); + final MOTDConfig cfg = this.miniMOTD.configManager().resolveConfig(event.getClient().getVirtualHost()); final PingResponse response = this.miniMOTD.createMOTD(cfg, event.getNumPlayers(), event.getMaxPlayers()); From 142ce3e4ec1f0d3834b7b2f0813f7c50f59e39ff Mon Sep 17 00:00:00 2001 From: XiYang6666 <1782356858@qq.com> Date: Sat, 18 May 2024 21:16:34 +0800 Subject: [PATCH 2/2] fix(bukkit): fix ExtraConfigs not loaded --- .../java/xyz/jpenilla/minimotd/bukkit/MiniMOTDPlugin.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/MiniMOTDPlugin.java b/platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/MiniMOTDPlugin.java index ac7050e..78eff15 100644 --- a/platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/MiniMOTDPlugin.java +++ b/platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/MiniMOTDPlugin.java @@ -51,6 +51,7 @@ public final class MiniMOTDPlugin extends JavaPlugin implements MiniMOTDPlatform public void onEnable() { this.logger = LoggerFactory.getLogger(this.getName()); this.miniMOTD = new MiniMOTD<>(this); + this.miniMOTD.configManager().loadExtraConfigs(); this.audiences = BukkitAudiences.create(this); if (PAPER_PING_EVENT_EXISTS) { @@ -123,6 +124,11 @@ private void suggestPaper() { this.logger.warn("======================================================"); } + @Override + public void onReload() { + this.miniMOTD.configManager().loadExtraConfigs(); + } + private static @Nullable Class findClass(final @NonNull String className) { try { return Class.forName(className);