Merge branch 'crash-fix' of https://github.com/GeyserMC/Geyser into crash-fix

# Conflicts:
#	connector/pom.xml
#	connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java
#	connector/src/main/java/org/geysermc/connector/network/translators/Registry.java
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
This commit is contained in:
Logicism 2019-07-21 18:22:51 -07:00
parent 0daa37eb67
commit fec817a36f

View file

@ -20,6 +20,9 @@ remote:
# The port of the remote (Java Edition) server # The port of the remote (Java Edition) server
port: 25565 port: 25565
online-mode: false online-mode: false
#Online Mode Credentials -Logicism
email: email@email.address
password: password
# Relay the MOTD, player count and max players from the remote server # Relay the MOTD, player count and max players from the remote server
ping-passthrough: false ping-passthrough: false