33 lines
1.8 KiB
Diff
33 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||
|
|
Date: Wed, 9 Oct 2019 21:51:43 -0500
|
||
|
|
Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
index b0eed4e18fc183856613c05f378576eb19985c46..2ef273e3b917803f3e2ac3c6a22d92a15b9eb71a 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
@@ -1070,6 +1070,8 @@ public class ServerPlayer extends Player implements ContainerListener {
|
||
|
|
this.lastSentHealth = -1.0F;
|
||
|
|
this.lastSentFood = -1;
|
||
|
|
|
||
|
|
+ setShiftKeyDown(false); // Paper - fix MC-10657
|
||
|
|
+
|
||
|
|
// CraftBukkit start
|
||
|
|
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
|
||
|
|
this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
index e6eebb8f6f48cc55fc8fb114c959b8fbec4b8472..dfdde9722bc0d83916779014b7718eef2c01b3db 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -842,6 +842,8 @@ public abstract class PlayerList {
|
||
|
|
entityplayer.connection.send(new ClientboundUpdateMobEffectPacket(entityplayer.getId(), mobEffect));
|
||
|
|
}
|
||
|
|
|
||
|
|
+ entityplayer.setShiftKeyDown(false); // Paper - fix MC-10657
|
||
|
|
+
|
||
|
|
// Fire advancement trigger
|
||
|
|
entityplayer.triggerDimensionChangeTriggers(((CraftWorld) fromWorld).getHandle());
|
||
|
|
|