Update Tuinity patches

patches/server/0006-Ridables.patch

@@ -1,4 +1,4 @@
-From 71031b29021f6399ec74e28c175b70c10578494b Mon Sep 17 00:00:00 2001
+From 781c2279df8a30208dc342bd2a934263ffe4a841 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
@@ -195,7 +195,7 @@ index 816d301f1c..f7344d3aec 100644
          this.C = true;
          return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 181f1742ac..30fff1a466 100644
+index 3cdba5c42a..b0942bde3f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -234,23 +234,23 @@ index 181f1742ac..30fff1a466 100644
      private float headHeight;
      // CraftBukkit start
      public boolean persist = true;
-@@ -913,6 +913,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -933,6 +933,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return vec3d1;
      }
 
 +    public static double getHorizontalDistanceSqr(Vec3D vec3d) { return b(vec3d); } // Purpur - OBFHELPER
      public static double b(Vec3D vec3d) {
          return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
      }
-@@ -1239,6 +1240,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1259,6 +1260,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return flag;
      }
 
 +    public boolean isInBubbleColumn() { return l(); } // Purpur - OBFHELPER
      private boolean l() {
          return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
      }
-@@ -1252,8 +1254,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1272,8 +1274,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain() || this.l();
      }
 
@@ -261,15 +261,15 @@ index 181f1742ac..30fff1a466 100644
      }
 
      public boolean aA() {
-@@ -1384,6 +1387,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1404,6 +1407,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.inLava;
      }
 
 +    public void moveRelative(float speed, Vec3D motion) { this.a(speed, motion); } // Purpur - OBFHELPER
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
 
-@@ -2212,7 +2216,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2232,7 +2236,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -284,7 +284,7 @@ index 181f1742ac..30fff1a466 100644
          }
          return true; // CraftBukkit
      }
-@@ -2247,6 +2257,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2267,6 +2277,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -297,23 +297,23 @@ index 181f1742ac..30fff1a466 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2415,6 +2431,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2435,6 +2451,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
 
 +    public boolean isGlowing() { return bt(); } // Purpur - OBFHELPER
      public boolean bt() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2633,6 +2650,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2653,6 +2670,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
 
      public void setHeadRotation(float f) {}
 
 +    public void setBodyYaw(float yaw) { l(yaw); } // Purpur - OBFHELPER
      public void l(float f) {}
 
      public boolean bA() {
-@@ -3478,4 +3496,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3498,4 +3516,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
 
          void accept(Entity entity, double d0, double d1, double d2);
      }

patches/server/0018-Cows-eat-mushrooms.patch

@@ -1,4 +1,4 @@
-From 8db8894db3cd06a5d0880d097255be17b611cc69 Mon Sep 17 00:00:00 2001
+From fee8e53ea5fb39b146f36a2059740a016eb6d054 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] Cows eat mushrooms
@@ -11,18 +11,18 @@ Subject: [PATCH] Cows eat mushrooms
  4 files changed, 77 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 30fff1a466..3b52f44b5f 100644
+index b0942bde3f..290607b66a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1137,6 +1137,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1157,6 +1157,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
 
 +    public void playSound(SoundEffect soundeffect, float volume, float pitch) { a(soundeffect, volume, pitch); } // Paper - OBFHELPER
      public void a(SoundEffect soundeffect, float f, float f1) {
          if (!this.isSilent()) {
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
-@@ -2677,6 +2678,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2697,6 +2698,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
 

patches/server/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch

@@ -1,4 +1,4 @@
-From 275747ed0be98ff0c1d03039f0ee3434c4c5cef3 Mon Sep 17 00:00:00 2001
+From 96d6a347eb4216c8839ef50b5fe78d0c0dee46f6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -25,18 +25,18 @@ index f7344d3aec..f6c0165f94 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3b52f44b5f..34cf8039c5 100644
+index 290607b66a..4f280aca7b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1484,6 +1484,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1504,6 +1504,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
 
 +    public double getDistanceSq(Entity entity) { return this.h(entity); } // Purpur - OBFHELPER
      public double h(Entity entity) {
          return this.c(entity.getPositionVector());
      }
-@@ -2007,14 +2008,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2027,14 +2028,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(new ItemStack(imaterial), (float) i);
      }
 

patches/server/0032-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From 28c1229a0fa4bd77ce56577a81cb6f23e89cd854 Mon Sep 17 00:00:00 2001
+From 80c196a657bccec715d713dc5a40dcb47052f9ca Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 34cf8039c5..d121e5080b 100644
+index 4f280aca7b..e18fbfdd0a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1384,6 +1384,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1404,6 +1404,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.inLava = true;
      }
 

patches/server/0038-Dont-send-useless-entity-packets.patch

@@ -1,4 +1,4 @@
-From 04d58cc1908e9823eba1e48bfa52683d9e650a02 Mon Sep 17 00:00:00 2001
+From 400e1baed69b069bb3b98ddd37b4e3209b4a7063 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets
@@ -10,7 +10,7 @@ Subject: [PATCH] Dont send useless entity packets
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index b4d3c4a4f..1dc29d7cd 100644
+index 0323055c68..6449663b57 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -168,6 +168,7 @@ public class EntityTrackerEntry {
@@ -41,11 +41,11 @@ index b4d3c4a4f..1dc29d7cd 100644
 +    }
 +    // Purpur end
 +
-     // Tuinity end - optimise entity tracking
-     // TODO make use of this in second pass rewrite
-     final void resetState() {
+     public final void onUntrack(EntityPlayer player) { this.a(player); } // Tuinity - OBFHELPER
+     public void a(EntityPlayer entityplayer) {
+         this.tracker.c(entityplayer);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
-index e5da2b19c..5b1d95935 100644
+index e5da2b19c1..5b1d959354 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
 @@ -5,11 +5,11 @@ import java.io.IOException;
@@ -66,7 +66,7 @@ index e5da2b19c..5b1d95935 100644
      protected boolean h;
      protected boolean i;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 345404c3a..e21931216 100644
+index 345404c3a1..e219312168 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -142,6 +142,11 @@ public class PurpurConfig {

patches/server/0049-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From c99d6744eeb5c60a89ef9610ad0262057780c6f1 Mon Sep 17 00:00:00 2001
+From 17f5f28322f45d104920cf8fb1343e468961c57b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:52 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent
@@ -86,7 +86,7 @@ index 09c7c13183..6880cdd7f9 100644
                      break;
                      // CraftBukkit start - add the block to our list
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d121e5080b..f2fdec4f1f 100644
+index e18fbfdd0a..d54bd814c8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -168,9 +168,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index d121e5080b..f2fdec4f1f 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2317,6 +2317,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2337,6 +2337,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.world.getMethodProfiler().enter("portal");
                      this.ag = i;
                      this.portalCooldown = this.ba();
@@ -141,7 +141,7 @@ index f84dd6d9be..f50e9670bc 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ff38e6c69c..d9bf65809d 100644
+index f19ef4d11c..eae1f79009 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -65,7 +65,7 @@ public class WorldServer extends World {

patches/server/0057-Ladders-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From 59914b40255eb58be586d1ca14b2c520cf789886 Mon Sep 17 00:00:00 2001
+From 3dbb1399beea2403ac2557977c1a4b422cb1f79f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,10 +17,10 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
  10 files changed, 25 insertions(+), 9 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f2fdec4f1f..574c9b8e36 100644
+index d54bd814c8..00a8df8a7f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1611,6 +1611,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1631,6 +1631,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
 
      public boolean isCollidable() {

patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch

@@ -1,4 +1,4 @@
-From 564b097a276c2d25ed4b8ca91b5a6eed6ef439c8 Mon Sep 17 00:00:00 2001
+From 2a32d1e318c8d4b1e9178fcd1db43b4ee7cdbf64 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -34,10 +34,10 @@ index d529b795c5..e883365b0b 100644
                      // Paper start
                      if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 574c9b8e36..125ab2adc9 100644
+index 00a8df8a7f..dd174f5065 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1628,6 +1628,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1648,6 +1648,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
 
      }
 

patches/server/0100-Add-item-entity-options.patch

@@ -1,4 +1,4 @@
-From 69cc0a5e126856f8c63806c0fe4a22b8705519a7 Mon Sep 17 00:00:00 2001
+From 72665a928fc6af9a009329f0ea38bff623b57f70 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options
@@ -10,10 +10,10 @@ Subject: [PATCH] Add item entity options
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 125ab2adc9..63c78e83fd 100644
+index dd174f5065..b45472b008 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1359,6 +1359,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1379,6 +1379,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
 
      }
 

patches/server/0102-Configurable-void-damage-height.patch

@@ -1,4 +1,4 @@
-From a3bbecb7563589578a72b322928e547f5a7d3743 Mon Sep 17 00:00:00 2001
+From 06e1fa817f67f44bb929c7a8cfa9cee651a8e8ad Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 21:42:19 -0600
 Subject: [PATCH] Configurable void damage height
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable void damage height
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ff42ee6eb6..a38a29e3d6 100644
+index b45472b008..8e3f672bcc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -550,7 +550,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -570,7 +570,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
 
      // Paper start
      protected void performVoidDamage() {
@@ -22,7 +22,7 @@ index ff42ee6eb6..a38a29e3d6 100644
              && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7e467230a7..0180d76845 100644
+index 3c5f83f651..938add0cf7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -198,6 +198,7 @@ public class PurpurWorldConfig {

patches/server/0103-Fix-the-dead-lagging-the-server.patch

@@ -1,4 +1,4 @@
-From 36ea3dd71dd8ee3fe9ed2859ae93588aa71eeb16 Mon Sep 17 00:00:00 2001
+From 6b074bee911939cd4bce9cd4ad670d820652f568 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix the dead lagging the server
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2e1ed61490..a65f8c7d73 100644
+index 8e3f672bcc..d9c5c1ddc4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1445,7 +1445,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1465,7 +1465,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
          this.lastYaw = this.yaw;
          this.lastPitch = this.pitch;