From 31411e8a37a1e80bacb389c6900c28feffc214d7 Mon Sep 17 00:00:00 2001 From: Alexander Noyle Date: Mon, 16 Mar 2026 04:18:17 -0400 Subject: [PATCH] Prefer AdvancedServerList-OG for paper integration --- .../maintenance/paper/MaintenancePaperPlugin.java | 11 +++++++---- paper/src/main/resources/plugin.yml | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/paper/src/main/java/eu/kennytv/maintenance/paper/MaintenancePaperPlugin.java b/paper/src/main/java/eu/kennytv/maintenance/paper/MaintenancePaperPlugin.java index 30a994e..46d921e 100644 --- a/paper/src/main/java/eu/kennytv/maintenance/paper/MaintenancePaperPlugin.java +++ b/paper/src/main/java/eu/kennytv/maintenance/paper/MaintenancePaperPlugin.java @@ -88,13 +88,16 @@ public final class MaintenancePaperPlugin extends MaintenancePlugin { continueLastEndtimer(); new Metrics(plugin, 2205); - final Plugin serverListPlus = pm.getPlugin("ServerListPlus"); - if (pm.isPluginEnabled(serverListPlus)) { - serverListPlusHook = new ServerListPlusHook(serverListPlus); + Plugin serverListPlugin = pm.getPlugin("AdvancedServerList-OG"); + if (serverListPlugin == null) { + serverListPlugin = pm.getPlugin("ServerListPlus"); + } + if (pm.isPluginEnabled(serverListPlugin)) { + serverListPlusHook = new ServerListPlusHook(serverListPlugin); if (settings.isEnablePingMessages()) { serverListPlusHook.setEnabled(!settings.isMaintenance()); } - plugin.getLogger().info("Enabled ServerListPlus integration"); + plugin.getLogger().info("Enabled server list plugin integration"); } if (false && pm.isPluginEnabled("LuckPerms")) { diff --git a/paper/src/main/resources/plugin.yml b/paper/src/main/resources/plugin.yml index f68d264..ffd6f14 100644 --- a/paper/src/main/resources/plugin.yml +++ b/paper/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ version: ${version} main: eu.kennytv.maintenance.paper.MaintenancePaperBase author: kennytv description: ${description} -softdepend: [ProtocolLib, ServerListPlus, ProtocolSupport, LuckPerms] +softdepend: [ProtocolLib, AdvancedServerList-OG, ProtocolSupport, LuckPerms] website: https://hangar.papermc.io/kennytv/Maintenance api-version: 1.13 folia-supported: true -- 2.47.3