From 891f39b28e846f493485e17a7675af3d21c3fa94 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 24 Feb 2023 20:21:57 +0100 Subject: [PATCH 1/8] Fix formatting Signed-off-by: Lixfel --- src/de/steamwar/sql/SQLWrapperImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/sql/SQLWrapperImpl.java b/src/de/steamwar/sql/SQLWrapperImpl.java index 176dfd4..3c24da8 100644 --- a/src/de/steamwar/sql/SQLWrapperImpl.java +++ b/src/de/steamwar/sql/SQLWrapperImpl.java @@ -100,7 +100,7 @@ public class SQLWrapperImpl implements SQLWrapper { for(ProxiedPlayer player : server.getValue().getPlayers()) { builder.append(player.getName()).append(" "); } - builder.append(")"); + builder.append(") "); } } } From 0db89d14249d443947a55f21d195b75f3b94295c Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 25 Feb 2023 07:35:48 +0100 Subject: [PATCH 2/8] Update BannedUserIPs Signed-off-by: Lixfel --- CommonCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonCore b/CommonCore index ec9d56d..3a8df67 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit ec9d56dab9091ddf514b5d8066c8313f5ad18c75 +Subproject commit 3a8df67f197748e24921f69a1c1c77ac6528ce05 From 5c6390f1f1aea9c3fcd5316b59691e5fa3ba2dc3 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sun, 26 Feb 2023 15:50:34 +0100 Subject: [PATCH 3/8] Fix MemberCache invalidation Signed-off-by: Lixfel --- CommonCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonCore b/CommonCore index 3a8df67..e36022e 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit 3a8df67f197748e24921f69a1c1c77ac6528ce05 +Subproject commit e36022e64fdb6d3ec58d85ae734766a141674c0a From ed3f8d836251a42df5dadc433643b10198822406 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 3 Mar 2023 16:14:34 +0100 Subject: [PATCH 4/8] Change to 1.19.3 Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/ServerStarter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/de/steamwar/bungeecore/ServerStarter.java b/src/de/steamwar/bungeecore/ServerStarter.java index 48aa65a..b71fd86 100644 --- a/src/de/steamwar/bungeecore/ServerStarter.java +++ b/src/de/steamwar/bungeecore/ServerStarter.java @@ -116,7 +116,7 @@ public class ServerStarter { public ServerStarter build19(UUID owner) { directory = new File(SERVER_PATH, "Bau19"); - serverJar = "paper-1.19.2.jar"; + serverJar = "paper-1.19.3.jar"; worldDir = WORLDS19_PATH; worldName = String.valueOf(SteamwarUser.get(owner).getId()); buildWithWorld(owner, new File(directory, "Bauwelt").getPath()); @@ -337,7 +337,7 @@ public class ServerStarter { public enum Version { SPIGOT_12("spigot-1.12.2.jar", 12), SPIGOT_15("spigot-1.15.2.jar", 15), - PAPER_19("paper-1.19.2.jar", 19); + PAPER_19("paper-1.19.3.jar", 19); private final String serverJar; private final int versionSuffix; From 603f3a09bff3e00b72dc29c1c2dc541621859e08 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 3 Mar 2023 18:00:59 +0100 Subject: [PATCH 5/8] Fix zero broadcast messages Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/Broadcaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/Broadcaster.java b/src/de/steamwar/bungeecore/Broadcaster.java index 925625c..3020d01 100644 --- a/src/de/steamwar/bungeecore/Broadcaster.java +++ b/src/de/steamwar/bungeecore/Broadcaster.java @@ -30,7 +30,7 @@ class Broadcaster { Broadcaster(){ ProxyServer.getInstance().getScheduler().schedule(BungeeCore.get(), () -> { - if(!ProxyServer.getInstance().getPlayers().isEmpty()) + if(!ProxyServer.getInstance().getPlayers().isEmpty() && broadCastMsgs.length > 0) BungeeCore.broadcast(BungeeCore.CHAT_PREFIX + broadCastMsgs[lastBroadCast]); lastBroadCast++; if(lastBroadCast == broadCastMsgs.length){ From 2f2584a6aea93414f7af4efe6d9f153125062a10 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 4 Mar 2023 11:55:58 +0100 Subject: [PATCH 6/8] No Discord on EventBungee Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/BungeeCore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/BungeeCore.java b/src/de/steamwar/bungeecore/BungeeCore.java index 4070bd7..ec81983 100644 --- a/src/de/steamwar/bungeecore/BungeeCore.java +++ b/src/de/steamwar/bungeecore/BungeeCore.java @@ -340,7 +340,7 @@ public class BungeeCore extends Plugin { } File discordFile = new File(System.getProperty("user.home"), "discord.yml"); - if(discordFile.exists()) { + if(discordFile.exists() && !EVENT_MODE) { try { SteamwarDiscordBotConfig.loadConfig(ConfigurationProvider.getProvider(YamlConfiguration.class).load(discordFile)); } catch (IOException e) { From 1a6fbb5a191d619b2803d831f87ce431ff655fe0 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 4 Mar 2023 12:12:24 +0100 Subject: [PATCH 7/8] Update CommonCore Signed-off-by: Lixfel --- CommonCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonCore b/CommonCore index e36022e..36bb4db 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit e36022e64fdb6d3ec58d85ae734766a141674c0a +Subproject commit 36bb4db5152940eb9b190552607c23079f6abee6 From 09c600ebed8054d98087a1ef029b8cd4e05d937a Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 4 Mar 2023 12:13:20 +0100 Subject: [PATCH 8/8] Update CommonCore Signed-off-by: Lixfel --- CommonCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonCore b/CommonCore index 36bb4db..32de0b9 160000 --- a/CommonCore +++ b/CommonCore @@ -1 +1 @@ -Subproject commit 36bb4db5152940eb9b190552607c23079f6abee6 +Subproject commit 32de0b912d823d90de274885ab2beaa6aa6d190a