From c00cbb72bba1e94cab7fee0dcad60a1a88e6e718 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 1 Sep 2020 02:18:45 -0300 Subject: [PATCH] fix compat between immersive portals --- .../ServerPlayNetworkHandler_antiCheatDisabledMixin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java index 6b93b508..3579ff8c 100644 --- a/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayNetworkHandler_antiCheatDisabledMixin.java @@ -42,7 +42,8 @@ public abstract class ServerPlayNetworkHandler_antiCheatDisabledMixin return isHost() || CarpetSettings.antiCheatDisabled; } - @Redirect(method = "onPlayerMove", at = @At( + @Redirect(method = "onPlayerMove", require = 0, // don't crash with immersive portals, + at = @At( value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;isInTeleportationState()Z")) private boolean relaxMoveRestrictions(ServerPlayerEntity serverPlayerEntity)