2 Commits

Author SHA1 Message Date
91d4a2dac3 Changes for new Server 2025-01-15 10:01:23 +01:00
f7c9c6d796 Fix tablist 2025-01-15 10:00:34 +01:00
4 changed files with 16 additions and 11 deletions

View File

@ -97,9 +97,9 @@ public abstract class Node {
protected void constructServerstart(File directory, List<String> cmd, String serverJar, String worldDir, String levelName, int port, String... dParams) {
if (JAVA_8.contains(serverJar))
cmd.add("/usr/lib/jvm/java-8-openj9-amd64/bin/java");
cmd.add("/usr/lib/jvm/openj9-8/bin/java");
else
cmd.add("/usr/lib/jvm/java-21-openj9-amd64/bin/java");
cmd.add("/usr/lib/jvm/openj9-21/bin/java");
for(String param : dParams){
cmd.add("-D" + param);
@ -113,7 +113,7 @@ public abstract class Node {
cmd.add("-XX:-CRIUSecProvider");
}
cmd.add("-jar");
cmd.add("/binarys/" + serverJar);
cmd.add("/jars/" + serverJar);
cmd.add("--log-strip-color");
cmd.add("--world-dir");
cmd.add(worldDir);

View File

@ -49,10 +49,10 @@ public class ServerStarter {
private static final String USER_HOME = System.getProperty("user.home") + "/";
private static final String EVENT_PATH = USER_HOME + "event/";
public static final String TEMP_WORLD_PATH = USER_HOME + "arenaserver/";
public static final String TUTORIAL_PATH = USER_HOME + "tutorials/";
public static final String WORLDS_BASE_PATH = USER_HOME + "userworlds";
public static final String BUILDER_BASE_PATH = USER_HOME + "builder";
public static final String TUTORIAL_PATH = "/worlds/tutorials/";
public static final String WORLDS_BASE_PATH = "/worlds/userworlds";
public static final String BUILDER_BASE_PATH = "/worlds/builder";
private File directory = null;
private String worldDir = null;

View File

@ -41,11 +41,10 @@ public enum ServerVersion {
PAPER_8("paper-1.8.8.jar", 8, ProtocolVersion.MINECRAFT_1_8),
PAPER_10("paper-1.10.2.jar", 10, ProtocolVersion.MINECRAFT_1_10),
PAPER_12("paper-1.12.2.jar", 12, ProtocolVersion.MINECRAFT_1_12_2),
PAPER_15("paper-1.15.2.jar", 15, ProtocolVersion.MINECRAFT_1_15_2),
PAPER_18("paper-1.18.2.jar", 15, ProtocolVersion.MINECRAFT_1_18_2),
PAPER_19("paper-1.19.3.jar", 19, ProtocolVersion.MINECRAFT_1_19_3),
PAPER_20("paper-1.20.1.jar", 20, ProtocolVersion.MINECRAFT_1_20),
PAPER_21("paper-1.21.jar", 21, ProtocolVersion.MINECRAFT_1_21_2);
PAPER_21("paper-1.21.3.jar", 21, ProtocolVersion.MINECRAFT_1_21_2);
private static final Map<String, ServerVersion> chatMap = new HashMap<>();
@ -66,7 +65,7 @@ public enum ServerVersion {
chatMap.put("mwg", ServerVersion.PAPER_20);
chatMap.put("miniwargear", ServerVersion.PAPER_20);
chatMap.put("19", ServerVersion.PAPER_19);
/*chatMap.put("19", ServerVersion.PAPER_19);
chatMap.put("1.19", ServerVersion.PAPER_19);
chatMap.put("1.19.2", ServerVersion.PAPER_19);
@ -76,7 +75,7 @@ public enum ServerVersion {
chatMap.put("12", ServerVersion.SPIGOT_12);
chatMap.put("1.12", ServerVersion.SPIGOT_12);
chatMap.put("1.12.2", ServerVersion.SPIGOT_12);
chatMap.put("1.12.2", ServerVersion.SPIGOT_12);*/
}
public static ServerVersion get(String chat) {

View File

@ -142,9 +142,15 @@ public class Tablist extends ChannelInboundHandlerAdapter {
}
public void onServerPostSwitch() {
if(player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20))
if(player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20)) {
if(player.getProtocolVersion().greaterThan(ProtocolVersion.MINECRAFT_1_20)) {
sendTabPacket(current, null);
current.clear();
}
sendPacket(player, createTeamPacket);
}
}
private void injection() {
connection = (VelocityServerConnection) player.getCurrentServer().orElse(null);