From 78c2722560ed08cbc5e22f823b6638045ac4e414 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 21:12:58 -0500 Subject: [PATCH] Fix item position desync (MC-4) --- src/main/java/net/minecraft/server/EntityTrackerEntry.java | 6 ++++++ src/main/java/net/minecraft/server/PacketPlayOutEntity.java | 2 ++ src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java index 61af5a99f7..b271e9aced 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -124,6 +124,12 @@ public class EntityTrackerEntry { ++this.o; i = MathHelper.d(this.tracker.yaw * 256.0F / 360.0F); j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F); + // Purpur start - fixes MC-4 + if (net.pl3x.purpur.PurpurConfig.fixItemPositionDesync && this.tracker instanceof EntityItem) { + Vec3D loc = PacketPlayOutEntity.decrypt(PacketPlayOutEntity.encrypt(tracker.locX), PacketPlayOutEntity.encrypt(tracker.locY), PacketPlayOutEntity.encrypt(tracker.locZ)); + tracker.setPosition(loc.getX(), loc.getY(), loc.getZ()); + } + // Purpur end Vec3D vec3d = (new Vec3D(this.tracker.locX, this.tracker.locY, this.tracker.locZ)).d(PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc)); boolean flag1 = vec3d.g() >= 7.62939453125E-6D; Packet packet1 = null; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java index 4c5a52c802..9ec3495d58 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java @@ -13,10 +13,12 @@ public class PacketPlayOutEntity implements Packet { protected boolean g; protected boolean h; + public static long encrypt(double d) { return a(d); } // Purpur - OBFHELPER public static long a(double d0) { return MathHelper.d(d0 * 4096.0D); } + public static Vec3D decrypt(long x, long y, long z) { return a(x, y, z); } // Purpur - OBFHELPER public static Vec3D a(long i, long j, long k) { return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index b4bd26cf5f..a3197414a9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -153,6 +153,11 @@ public class PurpurConfig { dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); } + public static boolean fixItemPositionDesync = false; + private static void fixItemPositionDesync() { + fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); + } + public static boolean requireShiftToMount = true; private static void requireShiftToMount() { requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount); -- 2.20.1