Fix stuck in sneak when changing worlds MC-10657

This commit is contained in:
William Blake Galbreath
2019-08-30 18:59:07 -05:00
parent a64bdd4e43
commit 3e985ba1d5

View File

@@ -0,0 +1,39 @@
From f837cc668f0ae41b6ac13a4564db053406bd5c99 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 30 Aug 2019 18:56:32 -0500
Subject: [PATCH] Fix stuck in sneak when changing worlds MC-10657
---
src/main/java/net/minecraft/server/EntityPlayer.java | 2 ++
src/main/java/net/minecraft/server/PlayerList.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index cfa608e22..ad9fa0488 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -963,6 +963,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.lastHealthSent = -1.0F;
this.lastFoodSent = -1;
+ setSneaking(false); // Purpur - fix MC-10657
+
// CraftBukkit start
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
this.world.getServer().getPluginManager().callEvent(changeEvent);
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a33285379..8ad9ccde9 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -728,6 +728,8 @@ public abstract class PlayerList {
entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect));
}
+ entityplayer.setSneaking(false); // Purpur - fix MC-10657
+
// Fire advancement trigger
entityplayer.b(((CraftWorld) fromWorld).getHandle());
--
2.23.0.rc1