diff --git a/Tuinity b/Tuinity
index f7c54286..a218f5d9 160000
--- a/Tuinity
+++ b/Tuinity
@@ -1 +1 @@
-Subproject commit f7c54286a49d29b289db8c7b3d6738e04c52afab
+Subproject commit a218f5d9795d023ab3b640ac94c58a3a77eb0401
diff --git a/patches/api/0006-Add-NBT-API-as-a-first-class-lib.patch b/patches/api/0006-Add-NBT-API-as-a-first-class-lib.patch
index 2cecd55b..e6ef47b6 100644
--- a/patches/api/0006-Add-NBT-API-as-a-first-class-lib.patch
+++ b/patches/api/0006-Add-NBT-API-as-a-first-class-lib.patch
@@ -77,10 +77,10 @@ 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 7808ade92ccd3553056c57cdf77464fb8bdf9312..801815e64bb281dbd480258db24a36892f485990 100644
+index cb9ef706eeb994f1948708ad5e8689550ea56df7..2b5641fd72d8b43d5de9539c76d4effc248798b5 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -695,4 +695,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -691,4 +691,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      public boolean isInLava();
      // Paper end
diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch
index d513b21b..4b0f47a8 100644
--- a/patches/server/0001-Yatopia-Server-Fixes.patch
+++ b/patches/server/0001-Yatopia-Server-Fixes.patch
@@ -585,7 +585,7 @@ index 7dd44fa8dc734862bf87691f1d7f4a5dae53b152..00000000000000000000000000000000
 -             int l = this.chunkMapDistance.b();
 -             // Paper start - per player mob spawning
 diff --git a/src/main/java/net/minecraft/server/ContainerSmithing.java b/src/main/java/net/minecraft/server/ContainerSmithing.java
-index a575dddb262021fd68b4db1435e67a1f0768c633..ac550534e1857eda046a93ac26231e6d71c5ef4e 100644
+index 61ef3adcfb021e222042de62ad06a2e7d808f5b5..f53ff805c5edf6398498aad396144d0fc964c74f 100644
 --- a/src/main/java/net/minecraft/server/ContainerSmithing.java
 +++ b/src/main/java/net/minecraft/server/ContainerSmithing.java
 @@ -73,9 +73,12 @@ public class ContainerSmithing extends ContainerAnvilAbstract {
@@ -1320,10 +1320,10 @@ index bccb7cd89241ca30549f5442a4ef9847cfdb67a9..00000000000000000000000000000000
 -     }
 - 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 102b5de835b15fb86c65948bdba0a5b3b7266844..32843a27ebe0235e4ef5a7c32c08bff9dad2abc2 100644
+index dc9621174b88c871c3579f04fee6bc1cfd1a3eff..fd3406f3b4457968d1a7cf8c9e9c79ef0c058538 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -365,7 +365,7 @@ public abstract class EntityLiving extends Entity {
+@@ -366,7 +366,7 @@ public abstract class EntityLiving extends Entity {
          this.aD = this.aC;
          this.lastYaw = this.yaw;
          this.lastPitch = this.pitch;
@@ -1332,7 +1332,7 @@ index 102b5de835b15fb86c65948bdba0a5b3b7266844..32843a27ebe0235e4ef5a7c32c08bff9
      }
  
      public boolean cM() {
-@@ -2503,10 +2503,10 @@ public abstract class EntityLiving extends Entity {
+@@ -2514,10 +2514,10 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.aK += (f3 - this.aK) * 0.3F;
@@ -1346,7 +1346,7 @@ index 102b5de835b15fb86c65948bdba0a5b3b7266844..32843a27ebe0235e4ef5a7c32c08bff9
  
          while (this.yaw - this.lastYaw < -180.0F) {
              this.lastYaw -= 360.0F;
-@@ -2540,7 +2540,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2551,7 +2551,7 @@ public abstract class EntityLiving extends Entity {
              this.aD += 360.0F;
          }
  
@@ -1355,7 +1355,7 @@ index 102b5de835b15fb86c65948bdba0a5b3b7266844..32843a27ebe0235e4ef5a7c32c08bff9
          this.aL += f2;
          if (this.isGliding()) {
              ++this.be;
-@@ -2741,19 +2741,19 @@ public abstract class EntityLiving extends Entity {
+@@ -2752,19 +2752,19 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.setMot(d4, d5, d6);
@@ -1380,7 +1380,7 @@ index 102b5de835b15fb86c65948bdba0a5b3b7266844..32843a27ebe0235e4ef5a7c32c08bff9
          if (this.jumping && this.cS()) {
              double d7;
  
-@@ -2780,8 +2780,8 @@ public abstract class EntityLiving extends Entity {
+@@ -2791,8 +2791,8 @@ public abstract class EntityLiving extends Entity {
              this.jumpTicks = 0;
          }
  
@@ -1391,7 +1391,7 @@ index 102b5de835b15fb86c65948bdba0a5b3b7266844..32843a27ebe0235e4ef5a7c32c08bff9
          this.aR *= 0.98F;
          this.aT *= 0.98F;
          this.r();
-@@ -2790,15 +2790,15 @@ public abstract class EntityLiving extends Entity {
+@@ -2801,15 +2801,15 @@ public abstract class EntityLiving extends Entity {
          // SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
          this.g(new Vec3D((double) this.aR, (double) this.aS, (double) this.aT));
          // SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -1639,7 +1639,7 @@ index d1016d22fbb2dd15042fd6ccdf2ee7848351e518..00000000000000000000000000000000
 - 
 -         entitypigzombie.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0));
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6e9d352de56280c66d6407e243fd3090736703a7..4a81cee4fff59f8db34623b677cff1d0c89fa92d 100644
+index 5e0285023676c0e99880f126a456cd84713fb065..0e84f43a5001fbad8acd5677a1f1e26968766bde 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -765,11 +765,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1974,7 +1974,7 @@ index 74d10212e547adf96762155adb03c0158df00a16..00000000000000000000000000000000
 -             ran = true;
 -         }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6a113ac7598c284dd17fc638c67c7f53aa9d04c8..4a8a768e66ee00c7230eb955c3cc14e100112dc2 100644
+index 7a7ba8047d3c9cde4b7a0bf6e921a5f4795ef9cc..8005f7eb073270a46f38601705ca4e89899015b1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -999,7 +999,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0003-Brandings.patch b/patches/server/0003-Brandings.patch
index 9ef0d1ee..2d312b45 100644
--- a/patches/server/0003-Brandings.patch
+++ b/patches/server/0003-Brandings.patch
@@ -17,7 +17,7 @@ index 74ed02fa9296583977bb721014b10ff8b708b43c..a13c7b2b5bc79ecaea404779149ed02c
                  .completer(new ConsoleCommandCompleter(this.server))
          );
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4a8a768e66ee00c7230eb955c3cc14e100112dc2..94cc21d445ad501e6ddd5cc5d45718e0c915149c 100644
+index 8005f7eb073270a46f38601705ca4e89899015b1..4f228fd552b7edbb810dc85636123a9234b736e9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1519,7 +1519,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0005-Add-getLastTickMs-api.patch b/patches/server/0005-Add-getLastTickMs-api.patch
index d7a55087..cc663dcc 100644
--- a/patches/server/0005-Add-getLastTickMs-api.patch
+++ b/patches/server/0005-Add-getLastTickMs-api.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getLastTickMs api
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 94cc21d445ad501e6ddd5cc5d45718e0c915149c..d2f7130752ec50bcb8fa2797652157ec2e97a285 100644
+index 4f228fd552b7edbb810dc85636123a9234b736e9..2056048851cfd9e4e079cf2543e55f613e3a18cb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -928,6 +928,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch b/patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch
index a8a2d11c..31161c47 100644
--- a/patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch
+++ b/patches/server/0006-Add-config-Yatopia-command-and-basic-settings.patch
@@ -37,10 +37,10 @@ index a60634fc455e8a59399020689b70eb64b6824d12..3601f6f104d204c10b4dacc013525651
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
          this.setResourcePack(dedicatedserverproperties.resourcePack, this.aZ());
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 32843a27ebe0235e4ef5a7c32c08bff9dad2abc2..4078582952fefe368e8e8c9c820d78ce8be5ca64 100644
+index fd3406f3b4457968d1a7cf8c9e9c79ef0c058538..ff6cbdcf91486b79c9d42d17675b2a1b9f8e7cad 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -266,6 +266,7 @@ public abstract class EntityLiving extends Entity {
+@@ -267,6 +267,7 @@ public abstract class EntityLiving extends Entity {
          //this.world.getMethodProfiler().enter("livingEntityBaseTick"); // Akarin - remove caller
          boolean flag = this instanceof EntityHuman;
  
@@ -48,7 +48,7 @@ index 32843a27ebe0235e4ef5a7c32c08bff9dad2abc2..4078582952fefe368e8e8c9c820d78ce
          if (this.isAlive()) {
              if (this.inBlock()) {
                  this.damageEntity(DamageSource.STUCK, 1.0F);
-@@ -281,6 +282,7 @@ public abstract class EntityLiving extends Entity {
+@@ -282,6 +283,7 @@ public abstract class EntityLiving extends Entity {
                  }
              }
          }
diff --git a/patches/server/0007-Per-entity-type-collision-settings.patch b/patches/server/0007-Per-entity-type-collision-settings.patch
index 09daf6e9..bc90a36c 100644
--- a/patches/server/0007-Per-entity-type-collision-settings.patch
+++ b/patches/server/0007-Per-entity-type-collision-settings.patch
@@ -59,10 +59,10 @@ index cb344a424bf4c657bb1bbca286a1136c9b21b489..82fc63dbfc0d48267e0c1972a312b714
  }
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4078582952fefe368e8e8c9c820d78ce8be5ca64..9a0348feab24e5fece91971e3f4e9dfdbf142a52 100644
+index ff6cbdcf91486b79c9d42d17675b2a1b9f8e7cad..00007e8b19567a9e1a364623e0bc091384c170b2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2849,7 +2849,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2860,7 +2860,7 @@ public abstract class EntityLiving extends Entity {
          // Paper - end don't run getEntities if we're not going to use its result
          // Tuinity start - reduce memory allocation from collideNearby
          List<Entity> list = com.tuinity.tuinity.util.CachedLists.getTempGetEntitiesList();
diff --git a/patches/server/0014-lithium-enum_values.patch b/patches/server/0014-lithium-enum_values.patch
index a9c11003..a748c9e3 100644
--- a/patches/server/0014-lithium-enum_values.patch
+++ b/patches/server/0014-lithium-enum_values.patch
@@ -39,10 +39,10 @@ index 5d3bb5f393a1e0e4a2e8b9a466530a91279697a9..7f084e7f11a829c10d113c7fb39eec0b
                  if (enumdirection2 != EnumDirection.DOWN && world.isBlockFacePowered(blockposition1.shift(enumdirection2), enumdirection2)) {
                      return true;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9a0348feab24e5fece91971e3f4e9dfdbf142a52..b8a20ece8dd053cb4e69d96b76bb38e5c9837eec 100644
+index 00007e8b19567a9e1a364623e0bc091384c170b2..45750f36bf51395ace76fd8f25b92a9e87581447 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2568,10 +2568,12 @@ public abstract class EntityLiving extends Entity {
+@@ -2579,10 +2579,12 @@ public abstract class EntityLiving extends Entity {
  
      }