2020-05-06 09:22:03 +00:00
|
|
|
From 740e4d3c326a5a0c1c02831286cf6d16e382b28d Mon Sep 17 00:00:00 2001
|
2019-11-24 06:02:47 +00:00
|
|
|
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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2020-05-06 09:22:03 +00:00
|
|
|
index fcd887ce30d..bb10857cf37 100644
|
2019-11-24 06:02:47 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2020-04-27 07:34:45 +00:00
|
|
|
@@ -984,6 +984,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2019-11-24 06:02:47 +00:00
|
|
|
this.lastHealthSent = -1.0F;
|
|
|
|
this.lastFoodSent = -1;
|
|
|
|
|
|
|
|
+ setSneaking(false); // Paper - 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
|
2020-05-06 09:22:03 +00:00
|
|
|
index b45911cf819..909d86e14c7 100644
|
2019-11-24 06:02:47 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-05-06 09:22:03 +00:00
|
|
|
@@ -718,6 +718,8 @@ public abstract class PlayerList {
|
2019-11-24 06:02:47 +00:00
|
|
|
entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect));
|
|
|
|
}
|
|
|
|
|
|
|
|
+ entityplayer.setSneaking(false); // Paper - fix MC-10657
|
|
|
|
+
|
|
|
|
// Fire advancement trigger
|
2019-12-12 16:20:43 +00:00
|
|
|
entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
|
2019-11-24 06:02:47 +00:00
|
|
|
|
|
|
|
--
|
2020-04-27 07:34:45 +00:00
|
|
|
2.26.2
|
2019-11-24 06:02:47 +00:00
|
|
|
|