Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-02 08:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
FlorianMichael 2023-11-27 17:57:24 +01:00
commit c5191b583d
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
View File

@ -51,7 +51,6 @@ import java.util.concurrent.CompletableFuture;
* - Add setting for VFP AlphaInventoryProvider * - Add setting for VFP AlphaInventoryProvider
* - Fix MixinAbstractDonkeyEntity * - Fix MixinAbstractDonkeyEntity
* - Check TO DO in MixinEntity * - Check TO DO in MixinEntity
* - Fix bedrock online mode
*/ */
public class ViaFabricPlus { public class ViaFabricPlus {
private static final ViaFabricPlus instance = new ViaFabricPlus(); private static final ViaFabricPlus instance = new ViaFabricPlus();

3
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
View File

@ -75,8 +75,7 @@ public abstract class MixinConnectScreen_1 {
final UserConnection userConnection = ((IClientConnection) clientConnection).viaFabricPlus$getUserConnection(); final UserConnection userConnection = ((IClientConnection) clientConnection).viaFabricPlus$getUserConnection();
if (userConnection == null) return; 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)) { if (targetVersion.isBetweenInclusive(VersionEnum.r1_19, VersionEnum.r1_19_1tor1_19_2)) {
final var keyPair = MinecraftClient.getInstance().getProfileKeys().fetchKeyPair().join().orElse(null); final var keyPair = MinecraftClient.getInstance().getProfileKeys().fetchKeyPair().join().orElse(null);
if (keyPair != null) { if (keyPair != null) {