From 702789cab56a602ed5812ddea2fcd7cca5d9f1eb Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 2 Jul 2021 00:28:49 -0300 Subject: [PATCH] 1.17.1-rc-1 --- gradle.properties | 4 ++-- src/main/java/carpet/commands/PlayerCommand.java | 2 +- .../mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java | 4 ++-- src/main/java/carpet/patches/EntityPlayerMPFake.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9fa7f22a..459b067d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.17.1-pre3 - yarn_mappings=1.17.1-pre3+build.1 + minecraft_version=1.17.1-rc1 + yarn_mappings=1.17.1-rc1+build.1 loader_version=0.11.6 fabric_version=0.36.0+1.17 diff --git a/src/main/java/carpet/commands/PlayerCommand.java b/src/main/java/carpet/commands/PlayerCommand.java index 3e24e3c6..b849276b 100644 --- a/src/main/java/carpet/commands/PlayerCommand.java +++ b/src/main/java/carpet/commands/PlayerCommand.java @@ -189,7 +189,7 @@ public class PlayerCommand Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r is already logged on"); return true; } - GameProfile profile = server.getUserCache().findByName(playerName); + GameProfile profile = server.getUserCache().findByName(playerName).orElse(null); if (profile == null) { if (!CarpetSettings.allowSpawningOfflinePlayers) diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java index 3811ddb2..812906b3 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java @@ -62,7 +62,7 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/network/ServerPlayerEntity;method_37413(Z)Z", // dropSelectedItem + target = "Lnet/minecraft/server/network/ServerPlayerEntity;dropSelectedItem(Z)Z", // dropSelectedItem ordinal = 0, shift = At.Shift.BEFORE )) @@ -84,7 +84,7 @@ public class ServerPlayNetworkHandler_scarpetEventsMixin @Inject(method = "onPlayerAction", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/network/ServerPlayerEntity;method_37413(Z)Z", // dropSelectedItem + target = "Lnet/minecraft/server/network/ServerPlayerEntity;dropSelectedItem(Z)Z", // dropSelectedItem ordinal = 1, shift = At.Shift.BEFORE )) diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index 9d811029..19dafed4 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -40,7 +40,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity UserCache.setUseRemote(false); GameProfile gameprofile; try { - gameprofile = server.getUserCache().findByName(username); + gameprofile = server.getUserCache().findByName(username).orElse(null); } finally { UserCache.setUseRemote(server.isDedicated() && server.isOnlineMode());