2020-03-01 00:39:00 +01:00
|
|
|
From d3d93a05728c92d839189478f6f31d069418f892 Mon Sep 17 00:00:00 2001
|
2019-11-24 07:02:47 +01: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-03-01 00:39:00 +01:00
|
|
|
index 07a2310b18..cb795aa733 100644
|
2019-11-24 07:02:47 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2020-03-01 00:39:00 +01:00
|
|
|
@@ -982,6 +982,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2019-11-24 07:02:47 +01: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-03-01 00:39:00 +01:00
|
|
|
index f702619aa2..7b79ee4fe5 100644
|
2019-11-24 07:02:47 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2019-12-12 17:20:43 +01:00
|
|
|
@@ -729,6 +729,8 @@ public abstract class PlayerList {
|
2019-11-24 07:02:47 +01:00
|
|
|
entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect));
|
|
|
|
}
|
|
|
|
|
|
|
|
+ entityplayer.setSneaking(false); // Paper - fix MC-10657
|
|
|
|
+
|
|
|
|
// Fire advancement trigger
|
2019-12-12 17:20:43 +01:00
|
|
|
entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
|
2019-11-24 07:02:47 +01:00
|
|
|
|
|
|
|
--
|
2020-01-30 10:36:03 +01:00
|
|
|
2.25.0
|
2019-11-24 07:02:47 +01:00
|
|
|
|