Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Fix NPE with ServerInfo being null for ping passthrough

Browse source
This commit is contained in:
RednedEpic 2020-01-02 12:37:30 -06:00
parent 145784b18d
commit 7d14d079ef
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java
View file

@ -65,7 +65,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
pong.setProtocolVersion(GeyserConnector.BEDROCK_1_14_PROTOCOL_VERSION); pong.setProtocolVersion(GeyserConnector.BEDROCK_1_14_PROTOCOL_VERSION);
pong.setVersion(GeyserConnector.BEDROCK_PACKET_CODEC.getMinecraftVersion()); pong.setVersion(GeyserConnector.BEDROCK_PACKET_CODEC.getMinecraftVersion());
pong.setIpv4Port(config.getBedrock().getPort()); pong.setIpv4Port(config.getBedrock().getPort());
if (connector.getConfig().isPingPassthrough()) { if (connector.getConfig().isPingPassthrough() && serverInfo != null) {
pong.setMotd(MessageUtils.getBedrockMessage(serverInfo.getDescription())); pong.setMotd(MessageUtils.getBedrockMessage(serverInfo.getDescription()));
pong.setSubMotd(config.getBedrock().getMotd2()); pong.setSubMotd(config.getBedrock().getMotd2());
pong.setPlayerCount(serverInfo.getPlayerInfo().getOnlinePlayers()); pong.setPlayerCount(serverInfo.getPlayerInfo().getOnlinePlayers());