mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-26 02:47:44 +01:00
48b6bfe2a6
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: c987938a SPIGOT-5180: Add Villager#sleep() and #wakeup() methods CraftBukkit Changes:7f33c6a2SPIGOT-5196: Restore previous version behaviour regarding cancelled BlockBreakEvent6a5fc902Improve diff in EntityHangingc98d61bfSPIGOT-4712: Allow spawning of upwards or downwards facing item framesdb971477SPIGOT-5199: Fix NPE if setting the book of the ItemMeta of a lecternb0ef3996SPIGOT-4679 Fix black lines after book paragraphs1215188fSPIGOT-5180: Add Villager#sleep() and #wakeup() methodsc03b2befSPIGOT-4975: NPE on WorldGenStronghold When Using Multiple Worlds65ea162cEnsure Bukkit data pack is always up to date0b107b8dMC-157395, SPIGOT-5193: Small armor stands do not drop loot6da0abcaSPIGOT-5195: Player loot table does not drop when keepInventory is on8b09d983SPIGOT-5190: Superfluous EntityCombustEvent called when using fire aspect sword Spigot Changes: 1981d553 SPIGOT-5198: Catch more bad async operations 6a14ca46 Rebuild patches
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From 7fc9411e0c2d870ae25a7e0c3da3ea22ddb5d24d 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 9dfa92f88..940663bd3 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -980,6 +980,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
|
|
|
|
}
|
|
|
|
--
|
|
2.22.0
|
|
|