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

Fixed merge conflicts

This commit is contained in:
Tim203 2021-03-23 01:46:33 +01:00
parent 107cd5bd5a
commit 4c6c397f37
No known key found for this signature in database
GPG Key ID: 064EE9F5BF7C3EE8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/GeyserConnector.java
View File

@ -195,7 +195,7 @@ public class GeyserConnector {
defaultAuthType = AuthType.getByName(config.getRemote().getAuthType());
if (authType == AuthType.FLOODGATE) {
if (defaultAuthType == AuthType.FLOODGATE) {
try {
Key key = new AesKeyProducer().produceFrom(config.getFloodgateKeyPath());
cipher = new AesCipher(new Base64Topping());

2
connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
View File

@ -97,7 +97,7 @@ public class JavaJoinGameTranslator extends PacketTranslator<ServerJoinGamePacke
session.sendDownstreamPacket(new ClientPluginMessagePacket("minecraft:brand", PluginMessageUtils.getGeyserBrandData()));
// register the plugin messaging channels used in Floodgate
if (session.getConnector().getAuthType() == AuthType.FLOODGATE) {
if (session.getConnector().getDefaultAuthType() == AuthType.FLOODGATE) {
session.sendDownstreamPacket(new ClientPluginMessagePacket("minecraft:register", PluginMessageUtils.getFloodgateRegisterData()));
}

4
connector/src/main/java/org/geysermc/connector/network/translators/java/JavaPluginMessageTranslator.java
View File

@ -42,8 +42,8 @@ import java.nio.charset.StandardCharsets;
public class JavaPluginMessageTranslator extends PacketTranslator<ServerPluginMessagePacket> {
@Override
public void translate(ServerPluginMessagePacket packet, GeyserSession session) {
// The only plugin messages to listen for are Floodgate plugin messages
if (session.getConnector().getAuthType() != AuthType.FLOODGATE) {
// The only plugin messages it has to listen for are Floodgate plugin messages
if (session.getConnector().getDefaultAuthType() != AuthType.FLOODGATE) {
return;
}