Merge branch 'master' of https://git.rainnny.club/Rainnny/RESTfulMC
This commit is contained in:
commit
eabea2546b
3
API/.gitignore
vendored
3
API/.gitignore
vendored
@ -1,4 +1,3 @@
|
|||||||
### Primary template
|
|
||||||
*.class
|
*.class
|
||||||
*.log
|
*.log
|
||||||
*.ctxt
|
*.ctxt
|
||||||
@ -27,4 +26,4 @@ crashlytics.properties
|
|||||||
crashlytics-build.properties
|
crashlytics-build.properties
|
||||||
fabric.properties
|
fabric.properties
|
||||||
git.properties
|
git.properties
|
||||||
pom.xml.versionsBackup
|
pom.xml.versionsBackup
|
@ -7,7 +7,7 @@ WORKDIR /home/container
|
|||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Build the app
|
# Build the app
|
||||||
RUN mvn clean package -DskipTests
|
RUN mvn clean package -q -DskipTests -T4C
|
||||||
|
|
||||||
# Exposting on port 80 so we can
|
# Exposting on port 80 so we can
|
||||||
# access via a reverse proxy for Dokku
|
# access via a reverse proxy for Dokku
|
||||||
|
@ -82,7 +82,7 @@ public final class BedrockMinecraftServer extends MinecraftServer {
|
|||||||
Version version = new Version(Integer.parseInt(split[2]), split[3]);
|
Version version = new Version(Integer.parseInt(split[2]), split[3]);
|
||||||
Players players = new Players(Integer.parseInt(split[4]), Integer.parseInt(split[5]), null);
|
Players players = new Players(Integer.parseInt(split[4]), Integer.parseInt(split[5]), null);
|
||||||
MOTD motd = MOTD.create(split[1] + "\n" + split[7]);
|
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);
|
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;
|
@NonNull private final String name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The numeric of this gamemode.
|
* The numeric of this gamemode, -1 if unknown.
|
||||||
*/
|
*/
|
||||||
private final int numericId;
|
private final int numericId;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user