From 5a87efe5ade5d0e035bdfd8be667930fe1f141be Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Wed, 1 Nov 2017 09:57:18 +0200 Subject: [PATCH 1/4] Fixed NoSuchMethodError on Paper 1.10.2 #394 --- .../com/djrapitops/plan/systems/tasks/TPSCountTimer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java index 631a35044..39f042463 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/tasks/TPSCountTimer.java @@ -175,7 +175,11 @@ public class TPSCountTimer extends AbsRunnable { * @return amount of entities */ private int getEntityCountPaper() { - return ((Plan) plugin).getServer().getWorlds().stream().mapToInt(World::getEntityCount).sum(); + try { + return ((Plan) plugin).getServer().getWorlds().stream().mapToInt(World::getEntityCount).sum(); + } catch (NoSuchMethodError e) { + return getEntityCount(); + } } public int getLatestPlayersOnline() { From c3310367716e4ee159c828cd726c5560bf69f176 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Wed, 1 Nov 2017 10:02:15 +0200 Subject: [PATCH 2/4] Fixed Negative Days being displayed #400 --- .../main/java/com/djrapitops/plan/utilities/FormatUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java index 0cfd57338..810413f7c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java @@ -94,7 +94,7 @@ public class FormatUtils { long hours = x % 24; x /= 24; long days = x % 365; - long months = days % 30; + long months = (days - days % 30) / 30; days -= months * 30; x /= 365; long years = x; From 74a94a81d5cfd8cdf9a1ab98756af81aff20ca4a Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Wed, 1 Nov 2017 10:14:00 +0200 Subject: [PATCH 3/4] Fixed Server Address Update Shenanigans #403 --- .../main/java/com/djrapitops/plan/Plan.java | 1 + .../java/com/djrapitops/plan/PlanBungee.java | 3 ++- .../info/server/BukkitServerInfoManager.java | 18 ++++++++++-------- .../info/server/BungeeServerInfoManager.java | 13 ++++++++++--- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/com/djrapitops/plan/Plan.java index d8546d807..71e5bde36 100644 --- a/Plan/src/main/java/com/djrapitops/plan/Plan.java +++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java @@ -175,6 +175,7 @@ public class Plan extends BukkitPlugin implements IPlan { if (!webServer.isEnabled()) { Log.error("WebServer was not successfully initialized. Is the port (" + Settings.WEBSERVER_PORT.getNumber() + ") in use?"); } + serverInfoManager.updateServerInfo(); Benchmark.stop("Enable", "WebServer Initialization"); diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java index a20da503c..8d3da9b19 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java @@ -80,8 +80,9 @@ public class PlanBungee extends BungeePlugin implements IPlan { serverInfoManager = new BungeeServerInfoManager(this); infoManager = new BungeeInformationManager(this); - webServer.initServer(); + serverInfoManager.loadServerInfo(); + if (!webServer.isEnabled()) { Log.error("WebServer was not successfully initialized."); diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BukkitServerInfoManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BukkitServerInfoManager.java index 4cc2dcb44..7dd7d768a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BukkitServerInfoManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BukkitServerInfoManager.java @@ -42,15 +42,8 @@ public class BukkitServerInfoManager { } catch (IOException e) { throw new PlanEnableException("Failed to read ServerInfoFile.yml", e); } - - Optional serverUUID = serverInfoFile.getUUID(); - try { - if (serverUUID.isPresent()) { - updateDbInfo(serverUUID.get()); - } else { - registerServer(); - } + updateServerInfo(); } catch (SQLException e) { throw new PlanEnableException("Failed to update Database server info", e); } catch (IOException e) { @@ -58,6 +51,15 @@ public class BukkitServerInfoManager { } } + public void updateServerInfo() throws SQLException, IOException { + Optional serverUUID = serverInfoFile.getUUID(); + if (serverUUID.isPresent()) { + updateDbInfo(serverUUID.get()); + } else { + registerServer(); + } + } + private void updateDbInfo(UUID serverUUID) throws SQLException, IOException { Optional serverID = serverTable.getServerID(serverUUID); if (!serverID.isPresent()) { diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java index db493514b..824c3d494 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java @@ -40,13 +40,20 @@ public class BungeeServerInfoManager { this.db = plugin.getDB(); serverTable = db.getServerTable(); - try { - bukkitServers = new HashMap<>(); - onlineServers = new HashSet<>(); + bukkitServers = new HashMap<>(); + onlineServers = new HashSet<>(); + } + public void loadServerInfo() throws PlanEnableException { + try { Optional bungeeInfo = db.getServerTable().getBungeeInfo(); if (bungeeInfo.isPresent()) { serverInfo = bungeeInfo.get(); + String accessAddress = plugin.getWebServer().getAccessAddress(); + if (!accessAddress.equals(serverInfo.getWebAddress())) { + serverInfo.setWebAddress(accessAddress); + serverTable.saveCurrentServerInfo(serverInfo); + } } else { serverInfo = registerBungeeInfo(); } From 9ed6b3b3c24328bf113c34dd11f26ce6c577324d Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Wed, 1 Nov 2017 10:17:10 +0200 Subject: [PATCH 4/4] 4.0.5 Version bump --- Plan/pom.xml | 2 +- Plan/src/main/resources/bungee.yml | 2 +- Plan/src/main/resources/plugin.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Plan/pom.xml b/Plan/pom.xml index a2a36f48a..0cb62d3a5 100644 --- a/Plan/pom.xml +++ b/Plan/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.djrapitops Plan - 4.0.4 + 4.0.5 jar diff --git a/Plan/src/main/resources/bungee.yml b/Plan/src/main/resources/bungee.yml index 78e2fa9a0..762c45d84 100644 --- a/Plan/src/main/resources/bungee.yml +++ b/Plan/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: Plan author: Rsl1122 main: main.java.com.djrapitops.plan.PlanBungee -version: 4.0.4 \ No newline at end of file +version: 4.0.5 \ No newline at end of file diff --git a/Plan/src/main/resources/plugin.yml b/Plan/src/main/resources/plugin.yml index 6dc2a9324..24bfb7f4b 100644 --- a/Plan/src/main/resources/plugin.yml +++ b/Plan/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: Plan author: Rsl1122 main: main.java.com.djrapitops.plan.Plan -version: 4.0.4 +version: 4.0.5 softdepend: - OnTime - EssentialsX