Fix NPE with ServerInfo being null for ping passthrough

This commit is contained in:
RednedEpic 2020-01-02 12:37:30 -06:00
parent 145784b18d
commit 7d14d079ef

View file

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