2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 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-08-26 08:22:13 +00:00
|
|
|
index 697068cbccde5b57f788246c2e1f4a5e7194993e..256677a48d1eebff89fa24dfbdc76a5003e4397d 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-08-26 08:22:13 +00:00
|
|
|
@@ -943,6 +943,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2020-08-25 02:22:08 +00:00
|
|
|
this.lastHealthSent = -1.0F;
|
|
|
|
this.lastFoodSent = -1;
|
2019-11-24 06:02:47 +00:00
|
|
|
|
|
|
|
+ setSneaking(false); // Paper - fix MC-10657
|
|
|
|
+
|
2020-08-25 02:22:08 +00:00
|
|
|
// CraftBukkit start
|
|
|
|
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
|
|
|
|
this.world.getServer().getPluginManager().callEvent(changeEvent);
|
2019-11-24 06:02:47 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-08-25 02:22:08 +00:00
|
|
|
index 978cda5490c9348fe02c1b1b90a1bb4988a3045b..f9eee8a5a06b300e1fece26e6a001da6b169b965 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-08-25 02:22:08 +00:00
|
|
|
@@ -771,6 +771,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
|
|
|
|