GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Apply motd change that wasn't possible during merge

This commit is contained in:
Konicai 2022-12-14 18:30:57 -05:00
parent 2d3dd89162
commit 3fca39094f
No known key found for this signature in database
GPG Key ID: 710D09287708C823
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
View File

@ -166,6 +166,10 @@ public final class GeyserServer {
pong.maximumPlayerCount(config.getMaxPlayers());
}
// https://github.com/GeyserMC/Geyser/issues/3388
pong.motd(pong.motd().replace(';', ':'));
pong.subMotd(pong.subMotd().replace(';', ':'));
// Fallbacks to prevent errors and allow Bedrock to see the server
if (pong.motd() == null || pong.motd().isBlank()) {
pong.motd(GeyserImpl.NAME);
@ -193,6 +197,14 @@ public final class GeyserServer {
}
}
if (config.isPassthroughPlayerCounts() && pingInfo != null) {
pong.playerCount(pingInfo.getPlayers().getOnline());
pong.maximumPlayerCount(pingInfo.getPlayers().getMax());
} else {
pong.playerCount(geyser.getSessionManager().getSessions().size());
pong.maximumPlayerCount(config.getMaxPlayers());
}
//Bedrock will not even attempt a connection if the client thinks the server is full
//so we have to fake it not being full
if (pong.playerCount() >= pong.maximumPlayerCount()) {