Update SubData
This commit is contained in:
ME1312
parent
0136419960
commit
489b25f48d
|
|
@ -43,7 +43,7 @@
|
|||
<dependency>
|
||||
<groupId>net.ME1312.SubData</groupId>
|
||||
<artifactId>Server</artifactId>
|
||||
<version>20w15a</version>
|
||||
<version>20w42a</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
|
@ -91,14 +91,14 @@
|
|||
<tasks>
|
||||
<mkdir dir="${project.build.directory}" />
|
||||
<copy file="${basedir}/../LICENSE" todir="${project.build.directory}/classes" />
|
||||
<mkdir dir="${basedir}/../Artifacts/-Lite" />
|
||||
<copy file="${basedir}/../Artifacts/SubServers.Client.jar" tofile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/client.jar" />
|
||||
<mkdir dir="${basedir}/../Artifacts/Modulized" />
|
||||
<copy file="${basedir}/../Artifacts/SubServers.Client.Universal.jar" tofile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/client.jar" />
|
||||
<mkdir dir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip" includes="Forge/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip" includes="Paper/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip" includes="Spigot/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip" includes="Sponge/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator/src" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip" includes="Vanilla/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip" includes="Forge/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip" includes="Paper/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip" includes="Spigot/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip" includes="Sponge/**" />
|
||||
<zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip" includes="Vanilla/**" />
|
||||
</tasks>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
@ -110,7 +110,7 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<tasks> <!-- Dependency Stripped Jar for Testing -->
|
||||
<jar destfile="${basedir}/../Artifacts/-Lite/SubServers.Bungee.jar" manifest="src/META-INF/MANIFEST.MF">
|
||||
<jar destfile="${basedir}/../Artifacts/Modulized/SubServers.Bungee.jar" manifest="src/META-INF/MANIFEST.MOD.MF">
|
||||
<zipfileset src="${basedir}/../Artifacts/SubServers.Bungee.jar" excludes="net/ME1312/Galaxi/** net/ME1312/SubData/**" />
|
||||
</jar>
|
||||
</tasks>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Manifest-Version: 1.0
|
||||
Class-Path: GalaxiEngine.jar SubDataServer.jar BungeeCord.jar Waterfall.jar
|
||||
Class-Path: BungeeCord.jar Waterfall.jar
|
||||
Main-Class: net.ME1312.SubServers.Bungee.Launch
|
||||
Implementation-Title: SubServers.Bungee
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
Manifest-Version: 1.0
|
||||
Class-Path: libraries/GalaxiEngine.jar libraries/SubDataServer.jar libraries/BungeeCord.jar
|
||||
Main-Class: net.ME1312.SubServers.Bungee.Launch
|
||||
Implementation-Title: SubServers.Bungee
|
||||
|
|
@ -33,24 +33,25 @@ public class SmartFallback implements ReconnectHandler {
|
|||
|
||||
@Override
|
||||
public ServerInfo getServer(ProxiedPlayer player) {
|
||||
Map<String, ServerInfo> fallbacks = getFallbackServers(player.getPendingConnection().getListener(), player);
|
||||
LinkedList<String> queue = new LinkedList<String>(fallbacks.keySet());
|
||||
return getServer(player, player instanceof UserConnection);
|
||||
}
|
||||
|
||||
ServerInfo server;
|
||||
if ((server = getForcedHost(player.getPendingConnection())) == null
|
||||
&& (server = getDNS(player.getPendingConnection())) == null
|
||||
&& (server = getReconnectServer(player)) == null) {
|
||||
if (!fallbacks.isEmpty()) {
|
||||
server = new LinkedList<ServerInfo>(fallbacks.values()).getFirst();
|
||||
}
|
||||
protected ServerInfo getServer(ProxiedPlayer player, boolean queue) {
|
||||
ServerInfo override;
|
||||
if ((override = getForcedHost(player.getPendingConnection())) != null
|
||||
|| (override = getDNS(player.getPendingConnection())) != null) {
|
||||
if (queue) ((UserConnection) player).setServerJoinQueue(new LinkedList<>());
|
||||
return override;
|
||||
} else {
|
||||
queue.addFirst(server.getName());
|
||||
Map<String, ServerInfo> fallbacks = getFallbackServers(player.getPendingConnection().getListener(), player);
|
||||
|
||||
if ((override = getReconnectServer(player)) != null || !fallbacks.isEmpty()) {
|
||||
if (queue) ((UserConnection) player).setServerJoinQueue(new LinkedList<>(fallbacks.keySet()));
|
||||
return (override != null)? override : new LinkedList<>(fallbacks.values()).getFirst();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (server != null && player instanceof UserConnection)
|
||||
((UserConnection) player).setServerJoinQueue(new LinkedList<>(fallbacks.keySet()));
|
||||
return server;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ public final class SubProxy extends BungeeCord implements Listener {
|
|||
public SubProtocol subprotocol;
|
||||
public SubDataServer subdata = null;
|
||||
public SubServer sudo = null;
|
||||
public static final Version version = Version.fromString("2.16.2a");
|
||||
public static final Version version = Version.fromString("2.16.4a");
|
||||
|
||||
public final Proxy mProxy;
|
||||
public boolean canSudo = false;
|
||||
|
|
@ -208,7 +208,7 @@ public final class SubProxy extends BungeeCord implements Listener {
|
|||
Logger.get("SubServers").info("Removed ./SubServers/Recently Deleted/" + file.getName());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Logger.get("SubServers").info("Problem scanning .SubServers/Recently Deleted/" + file.getName());
|
||||
Logger.get("SubServers").info("Problem scanning ./SubServers/Recently Deleted/" + file.getName());
|
||||
e.printStackTrace();
|
||||
Files.delete(file.toPath());
|
||||
}
|
||||
|
|
@ -669,8 +669,8 @@ public final class SubProxy extends BungeeCord implements Listener {
|
|||
}
|
||||
}, 0, TimeUnit.DAYS.toMillis(2));
|
||||
|
||||
int interval = config.get().getMap("Settings").getInt("RPEC-Check-Interval", 300);
|
||||
int start = interval - new Random().nextInt((interval / 3) + 1);
|
||||
int rpec_i = config.get().getMap("Settings").getInt("RPEC-Check-Interval", 300);
|
||||
int rpec_s = rpec_i - new Random().nextInt((rpec_i / 3) + 1);
|
||||
new Timer("SubServers.Bungee::RemotePlayer_Error_Checking").schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
|
@ -678,7 +678,6 @@ public final class SubProxy extends BungeeCord implements Listener {
|
|||
ArrayList<RemotePlayer> add = new ArrayList<RemotePlayer>();
|
||||
for (ProxiedPlayer player : getPlayers()) {
|
||||
if (!rPlayers.containsKey(player.getUniqueId())) { // Add players that don't exist
|
||||
Logger.get("SubServers").info("RPEC::Add(" + player.getUniqueId() + ")");
|
||||
RemotePlayer p = new RemotePlayer(player);
|
||||
rPlayerLinkP.put(player.getUniqueId(), p.getProxy());
|
||||
rPlayers.put(player.getUniqueId(), p);
|
||||
|
|
@ -689,7 +688,6 @@ public final class SubProxy extends BungeeCord implements Listener {
|
|||
ArrayList<RemotePlayer> remove = new ArrayList<RemotePlayer>();
|
||||
for (UUID player : Util.getBackwards(rPlayerLinkP, mProxy)) { // Remove players that shouldn't exist
|
||||
if (getPlayer(player) == null) {
|
||||
Logger.get("SubServers").info("RPEC::Remove(" + player + ")");
|
||||
remove.add(rPlayers.get(player));
|
||||
rPlayerLinkS.remove(player);
|
||||
rPlayerLinkP.remove(player);
|
||||
|
|
@ -707,7 +705,7 @@ public final class SubProxy extends BungeeCord implements Listener {
|
|||
}
|
||||
}
|
||||
}
|
||||
}, TimeUnit.SECONDS.toMillis(start), TimeUnit.SECONDS.toMillis(interval));
|
||||
}, TimeUnit.SECONDS.toMillis(rpec_s), TimeUnit.SECONDS.toMillis(rpec_i));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1007,11 +1005,9 @@ public final class SubProxy extends BungeeCord implements Listener {
|
|||
UUID id = e.getPlayer().getUniqueId();
|
||||
fallbackLimbo.remove(id);
|
||||
SubCommand.players.remove(id);
|
||||
Logger.get("SubServers").info("PlayerDisconnectEvent(" + id + ")");
|
||||
|
||||
synchronized (rPlayers) {
|
||||
if (rPlayers.containsKey(id) && (!rPlayerLinkP.containsKey(id) || rPlayerLinkP.get(id).isMaster())) {
|
||||
Logger.get("SubServers").info("RP::Remove(" + id + ")");
|
||||
RemotePlayer player = rPlayers.get(id);
|
||||
rPlayerLinkS.remove(id);
|
||||
rPlayerLinkP.remove(id);
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
<dependency>
|
||||
<groupId>net.ME1312.SubData</groupId>
|
||||
<artifactId>Client</artifactId>
|
||||
<version>20w15a</version>
|
||||
<version>20w42a</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
name: SubServers-Client-Bukkit
|
||||
main: net.ME1312.SubServers.Client.Bukkit.SubPlugin
|
||||
version: "2.16.2a"
|
||||
version: "2.16.4a"
|
||||
authors: ["ME1312"]
|
||||
softdepend: [TitleManager, PlaceholderAPI]
|
||||
website: "https://github.com/ME1312/SubServers-2"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
<dependency>
|
||||
<groupId>net.ME1312.SubData</groupId>
|
||||
<artifactId>Client</artifactId>
|
||||
<version>20w15a</version>
|
||||
<version>20w42a</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
|
|||
/**
|
||||
* SubServers Client Plugin Class
|
||||
*/
|
||||
@Plugin(id = "subservers-client-sponge", name = "SubServers-Client-Sponge", authors = "ME1312", version = "2.16.2a", url = "https://github.com/ME1312/SubServers-2", description = "Take control of the server manager — from your servers")
|
||||
@Plugin(id = "subservers-client-sponge", name = "SubServers-Client-Sponge", authors = "ME1312", version = "2.16.4a", url = "https://github.com/ME1312/SubServers-2", description = "Take control of the server manager — from your servers")
|
||||
public final class SubPlugin {
|
||||
HashMap<Integer, SubDataClient> subdata = new HashMap<Integer, SubDataClient>();
|
||||
NamedContainer<Long, Map<String, Map<String, String>>> lang = null;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
</dependencies>
|
||||
|
||||
<build>
|
||||
<directory>../../out/compile/target/SubServers.Client</directory>
|
||||
<directory>../../out/compile/target/SubServers.Client.Universal</directory>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>2.2-beta-5</version>
|
||||
<configuration>
|
||||
<finalName>SubServers.Client</finalName>
|
||||
<finalName>SubServers.Client.Universal</finalName>
|
||||
<outputDirectory>../../Artifacts</outputDirectory>
|
||||
<archive>
|
||||
<manifestFile>MANIFEST.MF</manifestFile>
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
<version>2.2-beta-5</version>
|
||||
<configuration>
|
||||
<finalName>SubServers.Console</finalName>
|
||||
<outputDirectory>../Artifacts</outputDirectory>
|
||||
<outputDirectory>../Artifacts/Plugins</outputDirectory>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>net.ME1312.SubServers</groupId>
|
||||
<artifactId>SubServers.Creator</artifactId>
|
||||
<version>-PLACEHOLDER</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<!-- This module is a placeholder; it has no real maven artifacts. -->
|
||||
</project>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<dependency>
|
||||
<groupId>net.ME1312.SubData</groupId>
|
||||
<artifactId>Client</artifactId>
|
||||
<version>20w15a</version>
|
||||
<version>20w42a</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
<tasks>
|
||||
<mkdir dir="${project.build.directory}" />
|
||||
<copy file="${basedir}/../LICENSE" todir="${project.build.directory}/classes" />
|
||||
<copy file="${basedir}/../Artifacts/SubServers.Client.jar" tofile="${project.build.directory}/classes/net/ME1312/SubServers/Host/Library/Files/client.jar" />
|
||||
<copy file="${basedir}/../Artifacts/SubServers.Client.Universal.jar" tofile="${project.build.directory}/classes/net/ME1312/SubServers/Host/Library/Files/client.jar" />
|
||||
</tasks>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<tasks> <!-- Dependency Stripped Jar for Testing -->
|
||||
<jar destfile="${basedir}/../Artifacts/-Lite/SubServers.Host.jar" manifest="src/META-INF/MANIFEST.MF">
|
||||
<jar destfile="${basedir}/../Artifacts/Modulized/SubServers.Host.jar" manifest="src/META-INF/MANIFEST.MOD.MF">
|
||||
<zipfileset src="${basedir}/../Artifacts/SubServers.Host.jar" excludes="net/ME1312/Galaxi/** net/ME1312/SubData/**" />
|
||||
</jar>
|
||||
</tasks>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
Manifest-Version: 1.0
|
||||
Class-Path: GalaxiEngine.jar SubDataClient.jar
|
||||
Main-Class: net.ME1312.SubServers.Host.Launch
|
||||
Implementation-Title: SubServers.Host
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
Manifest-Version: 1.0
|
||||
Class-Path: Libraries/GalaxiEngine.jar Libraries/SubDataClient.jar
|
||||
Main-Class: net.ME1312.SubServers.Host.Launch
|
||||
Implementation-Title: SubServers.Host
|
||||
|
|
@ -42,7 +42,7 @@ import java.util.jar.Manifest;
|
|||
/**
|
||||
* SubServers.Host Main Class
|
||||
*/
|
||||
@App(name = "SubServers.Host", version = "2.16.2a", authors = "ME1312", website = "https://github.com/ME1312/SubServers-2", description = "Host subservers on separate machines")
|
||||
@App(name = "SubServers.Host", version = "2.16.4a", authors = "ME1312", website = "https://github.com/ME1312/SubServers-2", description = "Host subservers on separate machines")
|
||||
public final class ExHost {
|
||||
HashMap<Integer, SubDataClient> subdata = new HashMap<Integer, SubDataClient>();
|
||||
NamedContainer<Long, Map<String, Map<String, String>>> lang = null;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
<dependency>
|
||||
<groupId>net.ME1312.SubData</groupId>
|
||||
<artifactId>Client</artifactId>
|
||||
<version>20w15a</version>
|
||||
<version>20w42a</version>
|
||||
<scope>compile</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<tasks> <!-- Dependency Stripped Jar for Testing -->
|
||||
<jar destfile="${basedir}/../Artifacts/-Lite/SubServers.Sync.jar" manifest="src/META-INF/MANIFEST.MF">
|
||||
<jar destfile="${basedir}/../Artifacts/Modulized/SubServers.Sync.jar" manifest="src/META-INF/MANIFEST.MOD.MF">
|
||||
<zipfileset src="${basedir}/../Artifacts/SubServers.Sync.jar" excludes="net/ME1312/Galaxi/** net/ME1312/SubData/**" />
|
||||
</jar>
|
||||
</tasks>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Manifest-Version: 1.0
|
||||
Class-Path: GalaxiEngine.jar SubDataClient.jar BungeeCord.jar Waterfall.jar
|
||||
Class-Path: BungeeCord.jar Waterfall.jar
|
||||
Main-Class: net.ME1312.SubServers.Sync.Launch
|
||||
Implementation-Title: SubServers.Sync
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
Manifest-Version: 1.0
|
||||
Class-Path: libraries/GalaxiEngine.jar libraries/SubDataClient.jar libraries/BungeeCord.jar
|
||||
Main-Class: net.ME1312.SubServers.Sync.Launch
|
||||
Implementation-Title: SubServers.Sync
|
||||
|
|
@ -68,7 +68,7 @@ public final class ExProxy extends BungeeCord implements Listener {
|
|||
public YAMLConfig config;
|
||||
public final SubAPI api = new SubAPI(this);
|
||||
public SubProtocol subprotocol;
|
||||
public static final Version version = Version.fromString("2.16.2a");
|
||||
public static final Version version = Version.fromString("2.16.4a");
|
||||
|
||||
public final boolean isPatched;
|
||||
public final boolean isGalaxi;
|
||||
|
|
@ -238,8 +238,8 @@ public final class ExProxy extends BungeeCord implements Listener {
|
|||
}
|
||||
}, 0, TimeUnit.DAYS.toMillis(2));
|
||||
|
||||
int interval = config.get().getMap("Settings").getInt("RPEC-Check-Interval", 300);
|
||||
int start = interval - new Random().nextInt((interval / 3) + 1);
|
||||
int rpec_i = config.get().getMap("Settings").getInt("RPEC-Check-Interval", 300);
|
||||
int rpec_s = rpec_i - new Random().nextInt((rpec_i / 3) + 1);
|
||||
new Timer("SubServers.Sync::RemotePlayer_Error_Checking").schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
|
@ -285,7 +285,7 @@ public final class ExProxy extends BungeeCord implements Listener {
|
|||
});
|
||||
}
|
||||
}
|
||||
}, TimeUnit.SECONDS.toMillis(start), TimeUnit.SECONDS.toMillis(interval));
|
||||
}, TimeUnit.SECONDS.toMillis(rpec_s), TimeUnit.SECONDS.toMillis(rpec_i));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -33,24 +33,25 @@ public class SmartFallback implements ReconnectHandler {
|
|||
|
||||
@Override
|
||||
public ServerInfo getServer(ProxiedPlayer player) {
|
||||
Map<String, ServerInfo> fallbacks = getFallbackServers(player.getPendingConnection().getListener(), player);
|
||||
LinkedList<String> queue = new LinkedList<String>(fallbacks.keySet());
|
||||
return getServer(player, player instanceof UserConnection);
|
||||
}
|
||||
|
||||
ServerInfo server;
|
||||
if ((server = getForcedHost(player.getPendingConnection())) == null
|
||||
&& (server = getDNS(player.getPendingConnection())) == null
|
||||
&& (server = getReconnectServer(player)) == null) {
|
||||
if (!fallbacks.isEmpty()) {
|
||||
server = new LinkedList<ServerInfo>(fallbacks.values()).getFirst();
|
||||
}
|
||||
protected ServerInfo getServer(ProxiedPlayer player, boolean queue) {
|
||||
ServerInfo override;
|
||||
if ((override = getForcedHost(player.getPendingConnection())) != null
|
||||
|| (override = getDNS(player.getPendingConnection())) != null) {
|
||||
if (queue) ((UserConnection) player).setServerJoinQueue(new LinkedList<>());
|
||||
return override;
|
||||
} else {
|
||||
queue.addFirst(server.getName());
|
||||
Map<String, ServerInfo> fallbacks = getFallbackServers(player.getPendingConnection().getListener(), player);
|
||||
|
||||
if ((override = getReconnectServer(player)) != null || !fallbacks.isEmpty()) {
|
||||
if (queue) ((UserConnection) player).setServerJoinQueue(new LinkedList<>(fallbacks.keySet()));
|
||||
return (override != null)? override : new LinkedList<>(fallbacks.values()).getFirst();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (server != null && player instanceof UserConnection)
|
||||
((UserConnection) player).setServerJoinQueue(new LinkedList<>(fallbacks.keySet()));
|
||||
return server;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue