65 lines
3.2 KiB
Diff
65 lines
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <mrhua269@gmail.com>
|
|
Date: Wed, 8 Jul 2026 21:20:44 +0800
|
|
Subject: [PATCH] Fix riding statistics desync
|
|
|
|
Referred to: https://github.com/CraftCanvasMC/Canvas/commit/057175b0c10d5a4d1d9059fd9d077750c32633b2
|
|
|
|
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
|
|
index 297269e18111b93692bdfbc318de6e9e38c18d50..c29167dee1855b142c78d9ae8700b25d97301f12 100644
|
|
--- a/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -2516,7 +2516,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
|
}
|
|
}
|
|
|
|
- private void checkRidingStatistics(final double dx, final double dy, final double dz) {
|
|
+ public void checkRidingStatistics(final double dx, final double dy, final double dz) { // Shiroha - Fix riding statics desync - make public
|
|
if (this.isPassenger() && !didNotMove(dx, dy, dz)) {
|
|
int distance = Math.round((float)Math.sqrt(dx * dx + dy * dy + dz * dz) * 100.0F);
|
|
Entity vehicle = this.getVehicle();
|
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
|
index 5d4d4d07cae83a98fcf16370c98a5118c39e1f5a..f18f8e24442ceb418996a86bca20ae7c0700af8a 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -4203,7 +4203,13 @@ public abstract class Entity
|
|
}
|
|
}
|
|
|
|
+ // Shiroha start - Fix riding statics desync
|
|
public void adjustRiders(boolean teleport) {
|
|
+ this.adjustRiders(teleport, false);
|
|
+ }
|
|
+
|
|
+ public void adjustRiders(boolean teleport, boolean syncStatics) {
|
|
+ // Shiroha end - Fix riding statics desync
|
|
java.util.ArrayDeque<EntityTreeNode> queue = new java.util.ArrayDeque<>();
|
|
queue.add(this);
|
|
|
|
@@ -4216,14 +4222,24 @@ public abstract class Entity
|
|
|
|
for (EntityTreeNode passenger : passengers) {
|
|
queue.add(passenger);
|
|
+ // Shiroha start - Fix riding statics desync
|
|
+ final double oldX = passenger.root.getX();
|
|
+ final double oldY = passenger.root.getY();
|
|
+ final double oldZ = passenger.root.getZ();
|
|
+ // Shiroha end - Fix riding statics desync
|
|
curr.root.positionRider(passenger.root, teleport ? Entity::snapTo : Entity::setPos);
|
|
+ // Shiroha start - Fix riding statics desync
|
|
+ if (syncStatics && passenger.root instanceof net.minecraft.server.level.ServerPlayer serverPlayer) {
|
|
+ serverPlayer.checkRidingStatistics(serverPlayer.getX() - oldX, serverPlayer.getY() - oldY, serverPlayer.getZ() - oldZ);
|
|
+ }
|
|
+ // Shiroha end - Fix riding statics desync
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public void repositionAllPassengers(boolean teleport) {
|
|
- this.makePassengerTree().adjustRiders(teleport);
|
|
+ this.makePassengerTree().adjustRiders(teleport, true); // Shiroha - Fix riding statics desync
|
|
}
|
|
|
|
protected EntityTreeNode makePassengerTree() {
|