git-mirrors/GeyserConnect
1
0
Fork 1
mirror of https://github.com/GeyserMC/GeyserConnect.git synced 2025-06-26 22:16:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start internal Geyser on boot

Browse source
This commit is contained in:
rtm516 2021-06-05 20:00:59 +01:00
parent 041edf515f
commit da0b96ed0f
No known key found for this signature in database
GPG key ID: 331715B8B007C67A
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/geysermc/connect/MasterServer.java
View file

@ -129,7 +129,7 @@ public class MasterServer {
// Create the base welcome.txt file // Create the base welcome.txt file
try { try {
FileUtils.fileOrCopiedFromResource(new File(MasterServer.getInstance().getGeyserConnectConfig().getWelcomeFile()), "welcome.txt", (x) -> x); FileUtils.fileOrCopiedFromResource(new File(getGeyserConnectConfig().getWelcomeFile()), "welcome.txt", (x) -> x);
} catch (IOException ignored) { } } catch (IOException ignored) { }
start(geyserConnectConfig.getPort()); start(geyserConnectConfig.getPort());
@ -182,6 +182,10 @@ public class MasterServer {
// Start server up // Start server up
bdServer.bind().join(); bdServer.bind().join();
// Create the Geyser instance
createGeyserProxy();
logger.info("Server started on " + geyserConnectConfig.getAddress() + ":" + port); logger.info("Server started on " + geyserConnectConfig.getAddress() + ":" + port);
} }

5
src/main/java/org/geysermc/connect/utils/Player.java
View file

@ -252,11 +252,6 @@ public class Player {
sendWindow(FormID.CONNECTING, UIHandler.getWaitingScreen(server)); sendWindow(FormID.CONNECTING, UIHandler.getWaitingScreen(server));
} }
if (!server.isBedrock()) {
// Create the Geyser instance if its not already running
MasterServer.getInstance().createGeyserProxy();
}
// Send the user over to the server // Send the user over to the server
setCurrentServer(server); setCurrentServer(server);
connectToProxy(); connectToProxy();