Merge remote-tracking branch 'origin/recode/3.0.0' into recode/3.0.0

ViaVersion · Nov 27, 2023 · c5191b5 · c5191b5
2 parents 29918be + 766048b
commit c5191b5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
@@ -51,7 +51,6 @@
  *  - Add setting for VFP AlphaInventoryProvider
  *  - Fix MixinAbstractDonkeyEntity
  *  - Check TO DO in MixinEntity
- *  - Fix bedrock online mode
  */
 public class ViaFabricPlus {
     private static final ViaFabricPlus instance = new ViaFabricPlus();

diff --git a/...ianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java b/...ianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
@@ -75,8 +75,7 @@ private void setupConnectionSessions(CallbackInfo ci, @Local ClientConnection cl
         final UserConnection userConnection = ((IClientConnection) clientConnection).viaFabricPlus$getUserConnection();
         if (userConnection == null) return;
 
-        final VersionEnum targetVersion = VersionEnum.fromUserConnection(userConnection);
-
+        final VersionEnum targetVersion = ProtocolHack.getTargetVersion();
         if (targetVersion.isBetweenInclusive(VersionEnum.r1_19, VersionEnum.r1_19_1tor1_19_2)) {
             final var keyPair = MinecraftClient.getInstance().getProfileKeys().fetchKeyPair().join().orElse(null);
             if (keyPair != null) {