From 87ccd1a6d89e951c88f064999415dbcda92f132b Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 4 Dec 2021 07:57:06 +0100 Subject: [PATCH 1/3] Fix possible world names for paper Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/SubserverSystem.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/SubserverSystem.java b/src/de/steamwar/bungeecore/SubserverSystem.java index 9e08df5c..877dec8e 100644 --- a/src/de/steamwar/bungeecore/SubserverSystem.java +++ b/src/de/steamwar/bungeecore/SubserverSystem.java @@ -96,6 +96,8 @@ public class SubserverSystem { if(mapName == null) mapName = serverName; + mapName = mapName.replace(' ', '_').replace("[", "").replace("]", ""); + String worldDir; if(eventFightID > 0) worldDir = EVENT_PATH; @@ -138,7 +140,7 @@ public class SubserverSystem { 0, 0, serverName, - serverName.replace(' ', '_') + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME), + serverName + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME), null, null, false); From 276cdf1762a06e5ca80b1154345613d7a46c220c Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 11 Dec 2021 16:54:06 +0100 Subject: [PATCH 2/3] Use default java instead of hardcoded java Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/Node.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/Node.java b/src/de/steamwar/bungeecore/Node.java index 4359b9c0..d53d2e8e 100644 --- a/src/de/steamwar/bungeecore/Node.java +++ b/src/de/steamwar/bungeecore/Node.java @@ -74,7 +74,7 @@ public abstract class Node { public abstract double getLoad(); protected void constructServerstart(File directory, List cmd, String serverJar, String worldDir, String levelName, int port, String xmx, String... dParams) { - cmd.add("/usr/lib/jvm/java-16-openj9-amd64/bin/java"); + cmd.add("java"); for(String param : dParams){ cmd.add("-D" + param); From fe80ede6e071f690207795968f2bdb9affaa0510 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Thu, 16 Dec 2021 17:10:27 +0100 Subject: [PATCH 3/3] Fix of 20+ Bans on lndi Signed-off-by: Chaoscaot --- src/de/steamwar/bungeecore/listeners/ChatListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java index 52c5fe0e..f66e71cd 100644 --- a/src/de/steamwar/bungeecore/listeners/ChatListener.java +++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java @@ -51,7 +51,7 @@ public class ChatListener extends BasicListener { public void onChatEvent(ChatEvent e){ if(e.getMessage().contains("jndi:ldap")) { e.setCancelled(true); - SteamwarUser.get(((ProxiedPlayer) e.getSender()).getUniqueId()).punish(Punishment.PunishmentType.Ban, Timestamp.from(Instant.now()), "Versuchte Exploit-Ausnutzung", 0, true); + SteamwarUser.get(((ProxiedPlayer) e.getSender()).getUniqueId()).punish(Punishment.PunishmentType.Ban, Timestamp.from(Instant.ofEpochSecond(946674800)), "Versuchte Exploit-Ausnutzung", 0, true); return; }