From 450ed0d75c7d58d666afd30f5a4c853fb0445a2f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:20:22 -0400 Subject: [PATCH] Keep players pitch/yaw on vehicle updates - fixes #1628 --- ...players-yaw-pitch-on-vehicle-updates.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Spigot-Server-Patches/0405-Keep-players-yaw-pitch-on-vehicle-updates.patch diff --git a/Spigot-Server-Patches/0405-Keep-players-yaw-pitch-on-vehicle-updates.patch b/Spigot-Server-Patches/0405-Keep-players-yaw-pitch-on-vehicle-updates.patch new file mode 100644 index 0000000000..24f6ce7562 --- /dev/null +++ b/Spigot-Server-Patches/0405-Keep-players-yaw-pitch-on-vehicle-updates.patch @@ -0,0 +1,28 @@ +From 0cb667d019381f677ba40181f34addd04c9dd8d0 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Fri, 2 Nov 2018 23:16:29 -0400 +Subject: [PATCH] Keep players yaw/pitch on vehicle updates + + +diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index e509be5622..e643709351 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -381,12 +381,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { + Location curPos = this.getPlayer().getLocation(); // Spigot + + entity.setLocation(d3, d4, d5, f, f1); +- player.setLocation(d3, d4, d5, f, f1); // CraftBukkit ++ player.setLocation(d3, d4, d5, player.yaw, player.pitch); // CraftBukkit // 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); // CraftBukkit ++ player.setLocation(d3, d4, d5, player.yaw, player.pitch); // CraftBukkit // Paper + this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity)); + return; + } +-- +2.19.1 +