SteamWar/BungeeCore
Archiviert
13
2

Merge remote-tracking branch 'origin/master'
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
yoyosource 2023-03-04 12:36:57 +01:00
Commit 0d45cacbbc
4 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -30,7 +30,7 @@ class Broadcaster {
Broadcaster(){ Broadcaster(){
ProxyServer.getInstance().getScheduler().schedule(BungeeCore.get(), () -> { 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]); BungeeCore.broadcast(BungeeCore.CHAT_PREFIX + broadCastMsgs[lastBroadCast]);
lastBroadCast++; lastBroadCast++;
if(lastBroadCast == broadCastMsgs.length){ if(lastBroadCast == broadCastMsgs.length){

Datei anzeigen

@ -340,7 +340,7 @@ public class BungeeCore extends Plugin {
} }
File discordFile = new File(System.getProperty("user.home"), "discord.yml"); File discordFile = new File(System.getProperty("user.home"), "discord.yml");
if(discordFile.exists()) { if(discordFile.exists() && !EVENT_MODE) {
try { try {
SteamwarDiscordBotConfig.loadConfig(ConfigurationProvider.getProvider(YamlConfiguration.class).load(discordFile)); SteamwarDiscordBotConfig.loadConfig(ConfigurationProvider.getProvider(YamlConfiguration.class).load(discordFile));
} catch (IOException e) { } catch (IOException e) {

Datei anzeigen

@ -116,7 +116,7 @@ public class ServerStarter {
public ServerStarter build19(UUID owner) { public ServerStarter build19(UUID owner) {
directory = new File(SERVER_PATH, "Bau19"); directory = new File(SERVER_PATH, "Bau19");
serverJar = "paper-1.19.2.jar"; serverJar = "paper-1.19.3.jar";
worldDir = WORLDS19_PATH; worldDir = WORLDS19_PATH;
worldName = String.valueOf(SteamwarUser.get(owner).getId()); worldName = String.valueOf(SteamwarUser.get(owner).getId());
buildWithWorld(owner, new File(directory, "Bauwelt").getPath()); buildWithWorld(owner, new File(directory, "Bauwelt").getPath());
@ -337,7 +337,7 @@ public class ServerStarter {
public enum Version { public enum Version {
SPIGOT_12("spigot-1.12.2.jar", 12), SPIGOT_12("spigot-1.12.2.jar", 12),
SPIGOT_15("spigot-1.15.2.jar", 15), 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 String serverJar;
private final int versionSuffix; private final int versionSuffix;

Datei anzeigen

@ -100,7 +100,7 @@ public class SQLWrapperImpl implements SQLWrapper {
for(ProxiedPlayer player : server.getValue().getPlayers()) { for(ProxiedPlayer player : server.getValue().getPlayers()) {
builder.append(player.getName()).append(" "); builder.append(player.getName()).append(" ");
} }
builder.append(")"); builder.append(") ");
} }
} }
} }