Updated Upstream and Sidestream(s) (Tuinity/Purpur)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
d41103d Updated Upstream (Paper)

Purpur Changes:
4984bb7 Updated Upstream (Paper)
a16a79c Updated Upstream (Paper)
bd83a6b Add predicate to recipe's ExactChoice ingredient (missing NMS side)
d469979 Rebuild patches
802a659 Persistent TileEntity Lore & DisplayName

Purpur

@@ -1 +1 @@
-Subproject commit debedee58753438601acf766297f73380f362aaa
+Subproject commit 4984bb71e086fd0204d62599ea94298873c212a4

Tuinity

@@ -1 +1 @@
-Subproject commit 1d73f6c98a24405f3458ce15fe491cc97434f5e3
+Subproject commit d41103d09837cbec91f381107f64cfcb48b91089

patches/api/0006-Add-NBT-API-as-a-first-class-lib.patch

@@ -77,12 +77,12 @@ index 3b10fcc13893403b29f0260b8605144679e89b82..1e9a96d8b08cc396acf73dc420830093
 +    // Yatopia end
  }
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index cb9ef706eeb994f1948708ad5e8689550ea56df7..2b5641fd72d8b43d5de9539c76d4effc248798b5 100644
+index 9bae4704b306b1d04534072690355983856c7801..0be0fee99ee62f7b5a86caee5d99705ceaaeece1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -691,4 +691,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -696,4 +696,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
-     public boolean isInLava();
+     public boolean isTicking();
      // Paper end
 +
 +    // Yatopia start
@@ -93,7 +93,7 @@ index cb9ef706eeb994f1948708ad5e8689550ea56df7..2b5641fd72d8b43d5de9539c76d4effc
 +     */
 +    @NotNull
 +    default de.tr7zw.changeme.nbtapi.NBTEntity getNBT() {
-+	    return new de.tr7zw.changeme.nbtapi.NBTEntity(this);
++        return new de.tr7zw.changeme.nbtapi.NBTEntity(this);
 +    }
 +
 +    /**
@@ -103,7 +103,7 @@ index cb9ef706eeb994f1948708ad5e8689550ea56df7..2b5641fd72d8b43d5de9539c76d4effc
 +     */
 +    @NotNull
 +    default de.tr7zw.changeme.nbtapi.NBTCompound getNBTC() {
-+	    return getNBT().getPersistentDataContainer();
++        return getNBT().getPersistentDataContainer();
 +    }
 +    // Yatopia end
  }

patches/server/0001-Yatopia-Server-Fixes.patch

@@ -758,7 +758,7 @@ index 8347faf8a7ee62d27cf5eb9f285695fddadfa624..00000000000000000000000000000000
 - 
 -             AttributeDefaults.a();
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fccac739adfd31c6a4c6a821c377268394b8666f..2058627ae1322b439c0b8513708145112f791d49 100644
+index 3595aa86a5fa51041fc3fca3f12bd1f0c16e5ed4..753d47a51f2e3e73d074324e2c1df681cdb41616 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -440,7 +440,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0010-Modify-default-configs.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Modify default configs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 301cecb0f5e9fd9b4ba421103c42b580f3e6bf18..2a1197c168f2bc292c86e870f261f45e5d6953bc 100644
+index e14d71d60c3433c39dcf217d48bd667b2c2b49e1..f5018d232372a40de4d26293faaafcd7ccde627f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -201,7 +201,7 @@ public class PaperConfig {

patches/server/0027-Fix-lead-fall-dmg-config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix lead fall dmg config
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2058627ae1322b439c0b8513708145112f791d49..798ce0029c980d340d74dff53d702ef3cd00e33e 100644
+index 753d47a51f2e3e73d074324e2c1df681cdb41616..b320110551afe5b03c727a4da5a63866088029b8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1264,6 +1264,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0034-lithium-collision-optimizations.patch

@@ -849,7 +849,7 @@ index ac6e5e3309affc830d4db07fd9b8d809c3085033..b7fcbef8d38c9406a891d64f8016bc16
      @Override
      public NBTTagCompound i(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 798ce0029c980d340d74dff53d702ef3cd00e33e..eec6dbda1b5a34122a75f11dfa82506f9763779c 100644
+index b320110551afe5b03c727a4da5a63866088029b8..6a2371aeb9b14ab851f8c44344f908d298b5eca7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -73,7 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0038-Load-also-the-chunk-that-you-re-teleporting-to.patch

@@ -27,7 +27,7 @@ index 00930eeea75758645b173f4bc2fbf635e1d426ba..2df0162d70d4d60f05565d22cb4ef69b
      // Tuinity end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 407c03408a312d54ab16a80ccdee5308af43c62f..f938732a64e8672873b8387d20776a5a73f4c01b 100644
+index 704d0000011668ecd9d048f35298658f2978d0f3..67e98634885a917f93c0c1accf2378f8efb608b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -545,7 +545,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

patches/server/0040-Nuke-streams-off-BlockPosition.patch

@@ -77,7 +77,7 @@ index dbe6f7d555e8c851faba5cafee8831c516256c09..6374f013137fe2b244c68706f58e23ff
          return a(MathHelper.floor(axisalignedbb.minX), MathHelper.floor(axisalignedbb.minY), MathHelper.floor(axisalignedbb.minZ), MathHelper.floor(axisalignedbb.maxX), MathHelper.floor(axisalignedbb.maxY), MathHelper.floor(axisalignedbb.maxZ));
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index eec6dbda1b5a34122a75f11dfa82506f9763779c..ffac4d061cbfb3428317d8f23c9de2efcac460a8 100644
+index 6a2371aeb9b14ab851f8c44344f908d298b5eca7..5dc87a7460667400433429567bc9eebe42a8a8fa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -802,11 +802,25 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

patches/server/0059-Use-faster-block-collision-check-for-entity-suffocat.patch

@@ -52,7 +52,7 @@ index 7ed343cfb3130446c85dab2ca04d60f91e2c94fb..194d2f177b05c594c7a27b6191860a3f
  
                  if (collisionShape != VoxelShapes.empty()) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ffac4d061cbfb3428317d8f23c9de2efcac460a8..2ae651710832e3b3bc4db16e5355f5012407a5b5 100644
+index 5dc87a7460667400433429567bc9eebe42a8a8fa..41ffb3b84bf7e80953d66e99564e0a66cfb9133b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2171,9 +2171,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke