diff --git a/Tuinity b/Tuinity
index bf2a4dcb..6316c976 160000
--- a/Tuinity
+++ b/Tuinity
@@ -1 +1 @@
-Subproject commit bf2a4dcb7c0050a33e59c3f10f83bf68074924fb
+Subproject commit 6316c9761bd7f95c9d3d4ec6cbb31baf88347529
diff --git a/patches/server/0039-Don-t-save-Fireworks-and-Arrows.patch b/patches/server/0039-Don-t-save-Fireworks-and-Arrows.patch
index c7662cd9..f2be8933 100644
--- a/patches/server/0039-Don-t-save-Fireworks-and-Arrows.patch
+++ b/patches/server/0039-Don-t-save-Fireworks-and-Arrows.patch
@@ -1,4 +1,4 @@
-From 732cfeed9395bbcedcb3792517e6503172aa05ea Mon Sep 17 00:00:00 2001
+From 9fbb1e47f53612dc3648fdfc97da351a6e2396da Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Wed, 26 Feb 2020 21:39:58 +0100
 Subject: [PATCH] Don't save Fireworks and Arrows
@@ -8,10 +8,10 @@ Subject: [PATCH] Don't save Fireworks and Arrows
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3cdba5c42..429666193 100644
+index 223ad3965..fa1fb7a40 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1636,7 +1636,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1653,7 +1653,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean c(NBTTagCompound nbttagcompound) {
diff --git a/patches/server/0042-Add-config-yapfa-command-and-basic-settings.patch b/patches/server/0042-Add-config-yapfa-command-and-basic-settings.patch
index 49aef0dd..2df62376 100644
--- a/patches/server/0042-Add-config-yapfa-command-and-basic-settings.patch
+++ b/patches/server/0042-Add-config-yapfa-command-and-basic-settings.patch
@@ -1,4 +1,4 @@
-From 0c2f4b89cf11f58387baa7bd964aaa84e3fefd23 Mon Sep 17 00:00:00 2001
+From fdc9dd192f39efb4e2a22b8ea93c272c08c56c67 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 22:31:50 +0100
 Subject: [PATCH] Add config, yapfa command and basic settings
@@ -396,10 +396,10 @@ index 610826c9e..2ed69f567 100644
  
          this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 429666193..2d97ecacb 100644
+index fa1fb7a40..8c21a1e73 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -781,6 +781,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -798,6 +798,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              try {
                  this.inLava = false;
@@ -407,7 +407,7 @@ index 429666193..2d97ecacb 100644
                  this.checkBlockCollisions();
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision");
-@@ -905,7 +906,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -922,7 +923,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
          VoxelShape voxelshape = this.world.getWorldBorder().a();
          Stream<VoxelShape> stream = VoxelShapes.c(voxelshape, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND) ? Stream.empty() : Stream.of(voxelshape);
diff --git a/patches/server/0046-Remove-Stream-usage.patch b/patches/server/0046-Remove-Stream-usage.patch
index e8923165..f5a2fa5f 100644
--- a/patches/server/0046-Remove-Stream-usage.patch
+++ b/patches/server/0046-Remove-Stream-usage.patch
@@ -1,4 +1,4 @@
-From 09fe7e940891f10e7eb8ace0ad12f1485f07ccf6 Mon Sep 17 00:00:00 2001
+From 89cd52730b413447c2756ce9981038d36e33f293 Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Mon, 23 Mar 2020 18:20:58 +0100
 Subject: [PATCH] Remove Stream usage
@@ -328,7 +328,7 @@ index 6def3616e..e1338f809 100644
  
      public Stream<MinecraftKey> c() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2d97ecacb..51b68de53 100644
+index 8c21a1e73..184a3843d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -13,6 +13,7 @@ import java.util.Locale;
@@ -339,7 +339,7 @@ index 2d97ecacb..51b68de53 100644
  import java.util.UUID;
  import java.util.concurrent.atomic.AtomicInteger;
  import java.util.stream.Stream;
-@@ -904,31 +905,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -921,31 +922,60 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private Vec3D e(Vec3D vec3d) {
          AxisAlignedBB axisalignedbb = this.getBoundingBox();
          VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
@@ -415,7 +415,7 @@ index 2d97ecacb..51b68de53 100644
          }
  
          return vec3d1;
-@@ -951,6 +981,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -968,6 +998,91 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              return a(vec3d, axisalignedbb, world, voxelshapecollision, streamaccumulator);
          }
      }