From 27c83a55baf7ae5564acd6a86d29076ad5ba929d Mon Sep 17 00:00:00 2001 From: Braydon Date: Sun, 14 Apr 2024 08:54:33 -0700 Subject: [PATCH 1/3] Update API/.gitignore --- API/.gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/API/.gitignore b/API/.gitignore index ff7f2fd..80ab21c 100644 --- a/API/.gitignore +++ b/API/.gitignore @@ -1,4 +1,3 @@ -### Primary template *.class *.log *.ctxt @@ -27,4 +26,4 @@ crashlytics.properties crashlytics-build.properties fabric.properties git.properties -pom.xml.versionsBackup +pom.xml.versionsBackup \ No newline at end of file From 4721b46ce9b7b78200f8575a798c733c700091e2 Mon Sep 17 00:00:00 2001 From: Braydon Date: Sun, 14 Apr 2024 09:16:09 -0700 Subject: [PATCH 2/3] Update API/Dockerfile --- API/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/API/Dockerfile b/API/Dockerfile index 1f0f412..086a3bc 100644 --- a/API/Dockerfile +++ b/API/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /home/container COPY . . # Build the app -RUN mvn clean package -DskipTests +RUN mvn clean package -q -DskipTests -T4C # Exposting on port 80 so we can # access via a reverse proxy for Dokku From 4777d7d5ebe17b2a5ad03360958816f97fbd402b Mon Sep 17 00:00:00 2001 From: Braydon Date: Sun, 14 Apr 2024 09:23:17 -0700 Subject: [PATCH 3/3] Fix a bug with some Bedrock servers missing data in the token --- .../me/braydon/mc/model/server/BedrockMinecraftServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/API/src/main/java/me/braydon/mc/model/server/BedrockMinecraftServer.java b/API/src/main/java/me/braydon/mc/model/server/BedrockMinecraftServer.java index f61c5b1..0bae16f 100644 --- a/API/src/main/java/me/braydon/mc/model/server/BedrockMinecraftServer.java +++ b/API/src/main/java/me/braydon/mc/model/server/BedrockMinecraftServer.java @@ -82,7 +82,7 @@ public final class BedrockMinecraftServer extends MinecraftServer { Version version = new Version(Integer.parseInt(split[2]), split[3]); Players players = new Players(Integer.parseInt(split[4]), Integer.parseInt(split[5]), null); MOTD motd = MOTD.create(split[1] + "\n" + split[7]); - GameMode gameMode = new GameMode(split[8], Integer.parseInt(split[9])); + GameMode gameMode = new GameMode(split[8], split.length > 9 ? Integer.parseInt(split[9]) : -1); return new BedrockMinecraftServer(split[6], hostname, ip, port, records, edition, version, players, motd, gameMode); } @@ -129,7 +129,7 @@ public final class BedrockMinecraftServer extends MinecraftServer { @NonNull private final String name; /** - * The numeric of this gamemode. + * The numeric of this gamemode, -1 if unknown. */ private final int numericId; }