2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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-11-09 01:09:37 +01:00
|
|
|
index bb79467c6bb0ed44057802dde6cd40fa81c8d4fd..ee53d2cf4cf893911d851a3a011861b020799ba3 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-11-03 03:22:15 +01:00
|
|
|
@@ -946,6 +946,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2020-08-25 04:22:08 +02:00
|
|
|
this.lastHealthSent = -1.0F;
|
|
|
|
this.lastFoodSent = -1;
|
2019-11-24 07:02:47 +01:00
|
|
|
|
|
|
|
+ setSneaking(false); // Paper - fix MC-10657
|
|
|
|
+
|
2020-08-25 04:22:08 +02:00
|
|
|
// CraftBukkit start
|
|
|
|
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
|
|
|
|
this.world.getServer().getPluginManager().callEvent(changeEvent);
|
2019-11-24 07:02:47 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-10-01 15:16:32 +02:00
|
|
|
index 120b4941a54750e94f8f10f809fb77214eb63c66..10427498fe34ab5b40ada89597d7ae0a96b5398a 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
|
2020-10-01 15:16:32 +02:00
|
|
|
@@ -773,6 +773,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
|
|
|
|