mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 03:48:01 +01:00
61709368af
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
CraftBukkit Changes:
dcb43ef8 MC-136886: locate command loads chunks without needing to.
Spigot Changes:
f823ac54 Rebuild patches
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
From 192a5b761d782ec3576db72ceb19416670fa8b57 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 21 Sep 2018 11:34:00 -0400
|
|
Subject: [PATCH] Sync Player Position to Vehicles
|
|
|
|
Player Positions could become desynced with their vehicle resulting
|
|
in chunk conflicts about which chunk the entity should really be in.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index 452c279708..e7a2df685d 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -375,10 +375,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
}
|
|
|
|
entity.setLocation(d3, d4, d5, f, f1);
|
|
+ Location curPos = getPlayer().getLocation(); // Paper
|
|
+ player.setLocation(d3, d4, d5, f, f1); // Paper
|
|
boolean flag2 = worldserver.getCubes(entity, entity.getBoundingBox().shrink(0.0625D));
|
|
|
|
if (flag && (flag1 || !flag2)) {
|
|
entity.setLocation(d0, d1, d2, f, f1);
|
|
+ player.setLocation(d0, d1, d2, f, f1); // Paper
|
|
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
|
|
return;
|
|
}
|
|
@@ -388,7 +391,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
// Spigot Start
|
|
if ( !hasMoved )
|
|
{
|
|
- Location curPos = player.getLocation();
|
|
+ //Location curPos = player.getLocation(); // Paper - move up
|
|
lastPosX = curPos.getX();
|
|
lastPosY = curPos.getY();
|
|
lastPosZ = curPos.getZ();
|
|
--
|
|
2.19.0
|
|
|