Merge remote-tracking branch 'origin/floodgate-2.0' into floodgate-2.0

bundabrg · May 31, 2021 · e16d83e · e16d83e
2 parents 209a4ff + 5376ba4
commit e16d83e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -802,9 +802,11 @@ public void packetReceived(PacketReceivedEvent event) {
                             SkinManager.handleBedrockSkin(playerEntity, clientData);
                         }
 
-                        // We'll send the skin upload a bit after the handshake packet (aka this packet),
-                        // because otherwise the global server returns the data too fast.
-                        getAuthData().upload(connector);
+                        if (remoteAuthType == AuthType.FLOODGATE) {
+                            // We'll send the skin upload a bit after the handshake packet (aka this packet),
+                            // because otherwise the global server returns the data too fast.
+                            getAuthData().upload(connector);
+                        }
                     }
 
                     PacketTranslatorRegistry.JAVA_TRANSLATOR.translate(event.getPacket().getClass(), event.getPacket(), GeyserSession.this);