Fixed merge conflicts

bundabrg · Mar 23, 2021 · 4c6c397 · 4c6c397
1 parent 107cd5b
commit 4c6c397
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
@@ -195,7 +195,7 @@ private GeyserConnector(PlatformType platformType, GeyserBootstrap bootstrap) {
 
         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());

diff --git a/...src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java b/...src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
@@ -97,7 +97,7 @@ public void translate(ServerJoinGamePacket packet, GeyserSession session) {
         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()));
         }
 

diff --git a/...ain/java/org/geysermc/connector/network/translators/java/JavaPluginMessageTranslator.java b/...ain/java/org/geysermc/connector/network/translators/java/JavaPluginMessageTranslator.java
@@ -42,8 +42,8 @@
 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;
         }