mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58e
SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579f
Add FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238
SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3
SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From b0a3d2baf0878e99b5852b16ac314019ef009af7 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Sun, 31 Jul 2016 16:33:03 -0500
|
|
Subject: [PATCH] Re-track players that dismount from other players
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index d4bba876d0..ae1f0d5783 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -997,6 +997,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
if (entity1 != entity && this.playerConnection != null) {
|
|
this.playerConnection.a(this.locX(), this.locY(), this.locZ(), this.yaw, this.pitch);
|
|
}
|
|
+ // Paper start - "Fixes" an issue in which the vehicle player would not be notified that the passenger dismounted
|
|
+ if (entity instanceof EntityPlayer) {
|
|
+ // TODO verify this solution
|
|
+ WorldServer worldServer = (WorldServer) entity.getWorld();
|
|
+ worldServer.getChunkProvider().playerChunkMap.removeEntity(this);
|
|
+ worldServer.getChunkProvider().playerChunkMap.addEntity(this);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
@@ -1013,7 +1021,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
if (!this.isSpectator()) {
|
|
super.b(blockposition);
|
|
}
|
|
-
|
|
}
|
|
|
|
public void a(double d0, boolean flag) {
|
|
--
|
|
2.25.1
|
|
|