Bacteriawa
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: Fri, 17 Apr 2026 23:24:07 +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 216c9263999f05c36fb4c5598b41ff70e5759f5e..6c2196726a0669bddda456a089aeec0d9d9bdfa3 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) { // Luminol - 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 18b9e630442fd31a14e131bb9043be46e10881e3..b475a8fe259848749ee05ff6cf10e46f52f955d3 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -4194,7 +4194,13 @@ public abstract class Entity
|
|
}
|
|
}
|
|
|
|
+ // Luminol start - Fix riding statics desync
|
|
public void adjustRiders(boolean teleport) {
|
|
+ this.adjustRiders(teleport, false);
|
|
+ }
|
|
+
|
|
+ public void adjustRiders(boolean teleport, boolean syncStatics) {
|
|
+ // Luminol end - Fix riding statics desync
|
|
java.util.ArrayDeque<EntityTreeNode> queue = new java.util.ArrayDeque<>();
|
|
queue.add(this);
|
|
|
|
@@ -4207,14 +4213,24 @@ public abstract class Entity
|
|
|
|
for (EntityTreeNode passenger : passengers) {
|
|
queue.add(passenger);
|
|
+ // Luminol start - Fix riding statics desync
|
|
+ final double oldX = passenger.root.getX();
|
|
+ final double oldY = passenger.root.getY();
|
|
+ final double oldZ = passenger.root.getZ();
|
|
+ // Luminol end - Fix riding statics desync
|
|
curr.root.positionRider(passenger.root, teleport ? Entity::snapTo : Entity::setPos);
|
|
+ // Luminol 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);
|
|
+ }
|
|
+ // Luminol end - Fix riding statics desync
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public void repositionAllPassengers(boolean teleport) {
|
|
- this.makePassengerTree().adjustRiders(teleport);
|
|
+ this.makePassengerTree().adjustRiders(teleport, true); // Luminol - Fix riding statics desync
|
|
}
|
|
|
|
protected EntityTreeNode makePassengerTree() {
|