mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
394c0f02f8
Upstream has released updates that appears to apply and compile correctly Paper Changes: 14513c3c Updated Upstream (Bukkit/CraftBukkit)
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
From 7bf0c70941d1bc10251b785b1783f78466c7e2be 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
|
|
|