geforkt von Mirrors/Paper
36 Zeilen
1.6 KiB
Diff
36 Zeilen
1.6 KiB
Diff
From 70175fafb3d228fa1e3ac420c9fc8199a0374607 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 3d0316e9..987303e3 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -982,6 +982,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
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
|
|
index 0ccfd8de..01345a62 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -716,6 +716,8 @@ public abstract class PlayerList {
|
|
entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect));
|
|
}
|
|
|
|
+ entityplayer.setSneaking(false); // Paper - fix MC-10657
|
|
+
|
|
// Fire advancement trigger
|
|
entityplayer.triggerDimensionAdvancements(((CraftWorld) fromWorld).getHandle());
|
|
|
|
--
|
|
2.25.1.windows.1
|
|
|