Compare commits

...
2 Commits
Author SHA1 Message Date
NanaChiyo0721 a33c1044ae Fix duplicated computed yaw and pitch in 0019
Shiroha CI / build (push) Canceled after 0s
Shiroha CI / Event File (push) Canceled after 0s
2026-08-14 23:39:47 +08:00
NanaChiyo0721 7209f9c356 Fix field name typo in CpuAffinityConfig 2026-08-14 23:29:18 +08:00
2 changed files with 1 additions and 16 deletions
@@ -17,21 +17,6 @@ index 2a64a5b2cf049661fe3f5a22ddfa39979624f5ec..0879af04be9dca539f0543f858e2fe46
cause, teleportFlags, onComplete 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 diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
index 465b21e6f787938993cc329873a826d9454fcd4b..35ec38780ed3c171fb9ae522a4693ac69ace5b2e 100644 index 465b21e6f787938993cc329873a826d9454fcd4b..35ec38780ed3c171fb9ae522a4693ac69ace5b2e 100644
--- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java --- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
@@ -106,7 +106,7 @@ public class CpuAffinityConfig implements IConfigModule {
if (enabledForChunkSystemWorker) { if (enabledForChunkSystemWorker) {
chunkSystemWorkerRunnableWrapper = new AffinityRunnableWrapper("chunk_system_worker", parseAffinity(chunkSystemWorkerAffinity)); chunkSystemWorkerRunnableWrapper = new AffinityRunnableWrapper("chunk_system_worker", parseAffinity(chunkSystemWorkerAffinity));
LOGGER.info("Chunk system worker thread now bound to: {}", chunkSystemIoRunnableWrapper.getAffinity()); LOGGER.info("Chunk system worker thread now bound to: {}", chunkSystemWorkerRunnableWrapper.getAffinity());
} }
if (enableForNettyIo) { if (enableForNettyIo) {