[ci-skip] Easier way to remove tuinity's revert of MC-4

patches/server/0001-Tuinity-Server-Changes.patch

@@ -352,6 +352,17 @@ Copy passenger list in enderTeleportTo
 
 Fixes https://github.com/Spottedleaf/Tuinity/issues/208
 
+Revert MC-4 fix
+
+When messing around with collisions, I ran into problems where
+entity position was off by ULP and that caused clipping problems.
+Now, the collision epsilon is 1.0e-7 to account for those errors.
+
+But this patch is going to cause problems on the order of 1.0e-4.
+
+I do not want to deal with clipping problems. The very fact it works
+shows it's causing the clipping to occur serverside.
+
 Prevent light queue overfill when no players are online
 
 block changes don't queue light updates (and they shouldn't)
@@ -10086,6 +10097,19 @@ index 6d716214e756fe1326cd3d2becea969076f6fd5b..fb1d640d89258477dd1286fff929deec
  
              if (entityhuman != null) {
                  double d0 = entityhuman.h((Entity) this); // CraftBukkit - decompile error
+diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
+index f41aaa7623c052b9f4044898d1bdee898c03057a..d99cecc4075338d7b8f154ab94d8ac04190ba371 100644
+--- a/src/main/java/net/minecraft/server/EntityItem.java
++++ b/src/main/java/net/minecraft/server/EntityItem.java
+@@ -526,7 +526,7 @@ public class EntityItem extends Entity {
+ 
+     // Paper start - fix MC-4
+     public void setPositionRaw(double x, double y, double z) {
+-        if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) {
++        if (false && com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Tuinity - revert
+             // encode/decode from PacketPlayOutEntity
+             x = MathHelper.floorLong(x * 4096.0D) * (1 / 4096.0D);
+             y = MathHelper.floorLong(y * 4096.0D) * (1 / 4096.0D);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
 index c8cdce899b109a7f554fec7aaa8235df4224cd1d..1c396ec56f35d8764e3bf7b67a7984393eb94b3b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java

patches/server/0079-Item-entity-immunities.patch

@@ -17,7 +17,7 @@ index 2e6b621694c4bbaeb2d7e3e2773bacda8374aa0d..308cb9cfb418e63f17f8f39c3db94f93
          return this.O == tag;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index f41aaa7623c052b9f4044898d1bdee898c03057a..1ab024c19761d97d0ac81edcc3fb1d9be8c40b5f 100644
+index d99cecc4075338d7b8f154ab94d8ac04190ba371..cbe03923d468bf75adc10245ebd9f63ff10987f9 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -23,6 +23,8 @@ public class EntityItem extends Entity {

patches/server/0165-Add-MC-4-fix-back.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <blake.galbreath@gmail.com>
+Date: Thu, 7 Jan 2021 07:51:25 -0600
+Subject: [PATCH] Add MC-4 fix back
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
+index cbe03923d468bf75adc10245ebd9f63ff10987f9..b47481e72cb63c8652fbdf292be29af14c796103 100644
+--- a/src/main/java/net/minecraft/server/EntityItem.java
++++ b/src/main/java/net/minecraft/server/EntityItem.java
+@@ -536,7 +536,7 @@ public class EntityItem extends Entity {
+ 
+     // Paper start - fix MC-4
+     public void setPositionRaw(double x, double y, double z) {
+-        if (false && com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Tuinity - revert
++        if (com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Tuinity - revert // Purpur - no
+             // encode/decode from PacketPlayOutEntity
+             x = MathHelper.floorLong(x * 4096.0D) * (1 / 4096.0D);
+             y = MathHelper.floorLong(y * 4096.0D) * (1 / 4096.0D);