aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0460-MC-4-Fix-item-position-desync.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0460-MC-4-Fix-item-position-desync.patch')
-rw-r--r--patches/server/0460-MC-4-Fix-item-position-desync.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/patches/server/0460-MC-4-Fix-item-position-desync.patch b/patches/server/0460-MC-4-Fix-item-position-desync.patch
new file mode 100644
index 0000000000..c30714f374
--- /dev/null
+++ b/patches/server/0460-MC-4-Fix-item-position-desync.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Tue, 8 Dec 2020 20:24:52 -0600
+Subject: [PATCH] MC-4: Fix item position desync
+
+This fixes item position desync (MC-4) by running the item coordinates
+through the encode/decode methods of the packet that causes the precision
+loss, which forces the server to lose the same precision as the client
+keeping them in sync.
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
+index ffec3deb9bcd31d51974c1deda2e76bc8374e5c5..a3d247c93ac1a2d872ff0e3841efc3d7b84fcbc1 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
++++ b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java
+@@ -9,12 +9,12 @@ public class VecDeltaCodec {
+
+ @VisibleForTesting
+ static long encode(double value) {
+- return Math.round(value * 4096.0);
++ return Math.round(value * 4096.0); // Paper - Fix MC-4; diff on change
+ }
+
+ @VisibleForTesting
+ static double decode(long value) {
+- return (double)value / 4096.0;
++ return value / 4096.0; // Paper - Fix MC-4; diff on change
+ }
+
+ public Vec3 decode(long x, long y, long z) {
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 3bc4b964d49d7de789506a482de9eb700051a2b8..67dd20b6fae2ee39eaae3286eba7b485a6dd41cc 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -4212,6 +4212,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ return;
+ }
+ // Paper end - Block invalid positions and bounding box
++ // Paper start - Fix MC-4
++ if (this instanceof ItemEntity) {
++ if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.fixEntityPositionDesync) {
++ // encode/decode from ClientboundMoveEntityPacket
++ x = Mth.lfloor(x * 4096.0) * (1 / 4096.0);
++ y = Mth.lfloor(y * 4096.0) * (1 / 4096.0);
++ z = Mth.lfloor(z * 4096.0) * (1 / 4096.0);
++ }
++ }
++ // Paper end - Fix MC-4
+ if (this.position.x != x || this.position.y != y || this.position.z != z) {
+ this.position = new Vec3(x, y, z);
+ int i = Mth.floor(x);