SteamWar/BungeeCore
Archiviert
13
2

Merge branch 'master' into bot_upload
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
Chaoscaot 2021-12-16 17:24:26 +01:00
Commit da9b5d82ab
3 geänderte Dateien mit 5 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -74,7 +74,7 @@ public abstract class Node {
public abstract double getLoad(); public abstract double getLoad();
protected void constructServerstart(File directory, List<String> cmd, String serverJar, String worldDir, String levelName, int port, String xmx, String... dParams) { protected void constructServerstart(File directory, List<String> 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){ for(String param : dParams){
cmd.add("-D" + param); cmd.add("-D" + param);

Datei anzeigen

@ -96,6 +96,8 @@ public class SubserverSystem {
if(mapName == null) if(mapName == null)
mapName = serverName; mapName = serverName;
mapName = mapName.replace(' ', '_').replace("[", "").replace("]", "");
String worldDir; String worldDir;
if(eventFightID > 0) if(eventFightID > 0)
worldDir = EVENT_PATH; worldDir = EVENT_PATH;
@ -138,7 +140,7 @@ public class SubserverSystem {
0, 0,
0, 0,
serverName, serverName,
serverName.replace(' ', '_') + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME), serverName + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME),
null, null,
null, null,
false); false);

Datei anzeigen

@ -51,7 +51,7 @@ public class ChatListener extends BasicListener {
public void onChatEvent(ChatEvent e){ public void onChatEvent(ChatEvent e){
if(e.getMessage().contains("jndi:ldap")) { if(e.getMessage().contains("jndi:ldap")) {
e.setCancelled(true); 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; return;
} }