From a33c1044aeffbf1414f02ad9b17fcb7982bc7669 Mon Sep 17 00:00:00 2001 From: NanaChiyo0721 Date: Fri, 14 Aug 2026 23:39:47 +0800 Subject: [PATCH] Fix duplicated computed yaw and pitch in 0019 --- ...t-missing-original-rotation-and-velocity.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch b/shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch index 474d061..9c96577 100644 --- a/shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch +++ b/shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch @@ -17,21 +17,6 @@ index 2a64a5b2cf049661fe3f5a22ddfa39979624f5ec..0879af04be9dca539f0543f858e2fe46 cause, teleportFlags, onComplete ); }, -diff --git a/net/minecraft/server/commands/TeleportCommand.java b/net/minecraft/server/commands/TeleportCommand.java -index 13d7965fd4f99f0848b080349df41f8b1c31a19b..4e58868bfb23671bde6296ee9361931564a77f9c 100644 ---- a/net/minecraft/server/commands/TeleportCommand.java -+++ b/net/minecraft/server/commands/TeleportCommand.java -@@ -248,8 +248,8 @@ public class TeleportCommand { - // Folia start - region threading - if (true) { - Vec3 posFinal = new Vec3(x, y, z); -- Float yawFinal = Float.valueOf(newYRot); -- Float pitchFinal = Float.valueOf(newXRot); -+ Float yawFinal = Float.valueOf(newYRot + victim.getYRot()); // Shiroha - Fix teleport missing original rotation and velocity -+ Float pitchFinal = Float.valueOf(newXRot + victim.getXRot()); // Shiroha - Fix teleport missing original rotation and velocity - victim.getBukkitEntity().taskScheduler.schedule((Entity nmsEntity) -> { - nmsEntity.stopRiding(); - nmsEntity.teleportAsync( diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java index 465b21e6f787938993cc329873a826d9454fcd4b..35ec38780ed3c171fb9ae522a4693ac69ace5b2e 100644 --- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java