From f05108fe63794a86b4c56fcfc9c8e8cf2f18c63f Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Tue, 8 Jan 2019 11:15:47 +0200 Subject: [PATCH] Fixed NPE on PlayersPage if Export is enabled --- .../com/djrapitops/plan/utilities/html/pages/PlayersPage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java index 5671d1db7..cfbedae81 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java @@ -22,6 +22,7 @@ import com.djrapitops.plan.system.database.databases.Database; import com.djrapitops.plan.system.file.PlanFiles; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.settings.config.PlanConfig; +import com.djrapitops.plan.system.settings.paths.PluginSettings; import com.djrapitops.plan.system.settings.paths.ProxySettings; import com.djrapitops.plan.system.update.VersionCheckSystem; import com.djrapitops.plan.utilities.formatting.PlaceholderReplacer; @@ -74,7 +75,7 @@ public class PlayersPage implements Page { placeholderReplacer.put("version", versionCheckSystem.getCurrentVersion()); placeholderReplacer.put("update", versionCheckSystem.getUpdateHtml().orElse("")); if (Check.isBukkitAvailable()) { - placeholderReplacer.put("networkName", serverInfo.getServer().getName()); + placeholderReplacer.put("networkName", config.get(PluginSettings.SERVER_NAME)); } else { placeholderReplacer.put("networkName", config.get(ProxySettings.NETWORK_NAME)); }