diff --git a/AirplaneLite b/AirplaneLite
index efe57d76..ff087b79 160000
--- a/AirplaneLite
+++ b/AirplaneLite
@@ -1 +1 @@
-Subproject commit efe57d76f967e345cab34f28e305ead78bc96e0e
+Subproject commit ff087b793c514b62745d9eb8be5f1f7168690119
diff --git a/Empirecraft b/Empirecraft
index 1d0cc885..e45a78e4 160000
--- a/Empirecraft
+++ b/Empirecraft
@@ -1 +1 @@
-Subproject commit 1d0cc885140821355a749eb69c53252a8e930ff0
+Subproject commit e45a78e4b8a2990e697e47667b9d90a25405afe8
diff --git a/Origami b/Origami
index d41f0b3e..36c0e05c 160000
--- a/Origami
+++ b/Origami
@@ -1 +1 @@
-Subproject commit d41f0b3eaaa143e114ec927fe9b470c354255904
+Subproject commit 36c0e05ca7b28d77f18fcd698c9b57f6c35d0ece
diff --git a/Purpur b/Purpur
index 391f9add..79d304ff 160000
--- a/Purpur
+++ b/Purpur
@@ -1 +1 @@
-Subproject commit 391f9addfd4be14e6f8b97c8ed8ce9f90919811d
+Subproject commit 79d304ff80a864161d685811ade645701e693fa9
diff --git a/Tuinity b/Tuinity
index 69e6a4cb..3e77330e 160000
--- a/Tuinity
+++ b/Tuinity
@@ -1 +1 @@
-Subproject commit 69e6a4cbf368ecbe167afb983666ccdf1463108a
+Subproject commit 3e77330ea2a797fdfc594cfd25c38a82d9613597
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 5631b49b..cd8d2b65 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 ff2e4fc8a632453e280f1a6ec05878b0e7fd2a9c..d07ea59deea33b6c425b26cfa14f6b3087b7ff79 100644
+index 76e857c364fe79e20cf9bde54b65e5b7108174fd..dc7e9983b89726625acce95026b45695b3f387b6 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -696,4 +696,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -698,4 +698,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      public boolean isTicking();
      // Paper end
diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch
index 2339e4b5..9eeea687 100644
--- a/patches/server/0001-Yatopia-Server-Fixes.patch
+++ b/patches/server/0001-Yatopia-Server-Fixes.patch
@@ -142,7 +142,7 @@ index 2291135eaef64c403183724cb6e413cd7e472672..6fcc7ed7c129e6a33386d65b37cbba4a
      public static long a(long i, EnumDirection enumdirection) {
          return a(i, enumdirection.getAdjacentX(), enumdirection.getAdjacentY(), enumdirection.getAdjacentZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 985d0d4aea2210e908ac76fbeafc0c895372aee7..d224b1d0e224853e825486559938aed2c56c3981 100644
+index c8bbcf43d3352b3d42e15a2e2d1673b08bc16402..119abc84fadb6b011813ae8667a48c87feffcdc4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -434,7 +434,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -411,7 +411,7 @@ index 39dce006ebf2bd81a9d6c62c25eb9bd55d24199e..00000000000000000000000000000000
 -             }
 -             // Spigot Start
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 23bc865ea46b9113194f7da023310b8559f8b819..6c25e22da6568837c636d0a30c970676184b576d 100644
+index f5c827f7427e7b743e8ec2adbcbc478735d028d4..718528409154348733166240478e9d577aa87b6e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0003-Brandings.patch b/patches/server/0003-Brandings.patch
index fd7b1881..dfd25ceb 100644
--- a/patches/server/0003-Brandings.patch
+++ b/patches/server/0003-Brandings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Brandings
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 3b9b44851c5832a3660a73449b52478c73ffb23a..72a66bac12af503488296c420f4cc3b13946db35 100644
+index 4d8740678049aa749b42618470e9cc838555528d..159f72efe20f8fee940bd00ae7af00f026f51b1a 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -585,7 +585,7 @@ public class Metrics {
+@@ -593,7 +593,7 @@ public class Metrics {
              boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
@@ -17,7 +17,7 @@ index 3b9b44851c5832a3660a73449b52478c73ffb23a..72a66bac12af503488296c420f4cc3b1
  
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
-@@ -595,7 +595,7 @@ public class Metrics {
+@@ -603,7 +603,7 @@ public class Metrics {
  
                  metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
                  metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (PaperConfig.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
diff --git a/patches/server/0007-Yatopia-configuration.patch b/patches/server/0007-Yatopia-configuration.patch
index e6d633c7..66dbd9e6 100644
--- a/patches/server/0007-Yatopia-configuration.patch
+++ b/patches/server/0007-Yatopia-configuration.patch
@@ -47,7 +47,7 @@ index 3ee8d31c453105eca7b96bede39a9ebbf40e1c2c..0a9f03526abf0638ada15d9810b94988
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
          this.setResourcePack(dedicatedserverproperties.resourcePack, this.ba());
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 7d27d25125e6d7afa61e179bafd4455473e0887e..457eaba83b3c298669796288421276782767a4d6 100644
+index 1b646a7bb1588ebff5b4fdb12bd3016084041e77..d37143396cac0bc8980b03fe0e5e31cc4ecf08ff 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 {
diff --git a/patches/server/0008-Per-entity-type-collision-settings.patch b/patches/server/0008-Per-entity-type-collision-settings.patch
index 31e4890c..c6c72100 100644
--- a/patches/server/0008-Per-entity-type-collision-settings.patch
+++ b/patches/server/0008-Per-entity-type-collision-settings.patch
@@ -59,10 +59,10 @@ index 537456a7427cddd6783f5b5d8ee2d655668c4c53..004184a7c3da4f72f68a5fd9b4dd5abd
  }
 \ 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 457eaba83b3c298669796288421276782767a4d6..d55f60c317465fe2849d12c8ca1e359d1837fd46 100644
+index d37143396cac0bc8980b03fe0e5e31cc4ecf08ff..862d54fdb9a0908d0c279e55437cf8ab7b9b55d3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2858,7 +2858,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2864,7 +2864,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/0011-Modify-default-configs.patch b/patches/server/0011-Modify-default-configs.patch
index 54de9718..a4f8c8c8 100644
--- a/patches/server/0011-Modify-default-configs.patch
+++ b/patches/server/0011-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 5e24ddc7dce6f6ed45267df3217177583bdd9eb0..62e120242ec8cfbadc4d9e1b81f4ccc19c240aed 100644
+index 041016de85360adacf4a5d0845bb1ebcc25a14b9..0f45769b5d8b9b6c4a89550db16576c5c7221e04 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -206,7 +206,7 @@ public class PaperConfig {
diff --git a/patches/server/0014-lithium-enum_values.patch b/patches/server/0014-lithium-enum_values.patch
index 39d6a26a..706f62df 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 d55f60c317465fe2849d12c8ca1e359d1837fd46..e476ce7a5fdb2d409471022be3cf81ac67b997b3 100644
+index 862d54fdb9a0908d0c279e55437cf8ab7b9b55d3..a9a32ff9e44f31eeb52180777dffffcbef93bd83 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2579,10 +2579,12 @@ public abstract class EntityLiving extends Entity {
+@@ -2585,10 +2585,12 @@ public abstract class EntityLiving extends Entity {
  
      }
  
diff --git a/patches/server/0025-Fix-lead-fall-dmg-config.patch b/patches/server/0025-Fix-lead-fall-dmg-config.patch
index e8f5f600..8bb37b13 100644
--- a/patches/server/0025-Fix-lead-fall-dmg-config.patch
+++ b/patches/server/0025-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 d224b1d0e224853e825486559938aed2c56c3981..0bca08dc6ffd367de7cffab0433900d6bfe555cf 100644
+index 119abc84fadb6b011813ae8667a48c87feffcdc4..cc5d3fe169d02216a828a83be0f83f84c117cde9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1290,6 +1290,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0029-Use-offline-uuids-if-we-need-to.patch b/patches/server/0029-Use-offline-uuids-if-we-need-to.patch
index 51ee9706..53f512e5 100644
--- a/patches/server/0029-Use-offline-uuids-if-we-need-to.patch
+++ b/patches/server/0029-Use-offline-uuids-if-we-need-to.patch
@@ -20,10 +20,10 @@ Thanks to Gabriele C <sgdc3.mail@gmail.com> for pointing this issue to us, as he
 have any interest fixing this.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index caaa01b20e5b7430b809477022f8ab35f3c5bf20..dfa719716efdb93b2f4440916bef70971a2a404d 100644
+index 3ef463e1313b9729c86437f499930ab4cd332a6d..50ba26eafcfd5024e2795f13a0b04877b2cd6688 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1914,7 +1914,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1921,7 +1921,7 @@ public abstract class EntityHuman extends EntityLiving {
      public static UUID a(GameProfile gameprofile) {
          UUID uuid = gameprofile.getId();
  
diff --git a/patches/server/0040-Optimize-whitelist-command-for-multiple-additions-re.patch b/patches/server/0040-Optimize-whitelist-command-for-multiple-additions-re.patch
index b3d035e5..415c2811 100644
--- a/patches/server/0040-Optimize-whitelist-command-for-multiple-additions-re.patch
+++ b/patches/server/0040-Optimize-whitelist-command-for-multiple-additions-re.patch
@@ -111,7 +111,7 @@ index 893d2c1c74ed28dcdb83b71762ccdcbfd50a8f9d..107091a4cae0e4eaba93f69ae91239ab
  
      private static int b(CommandListenerWrapper commandlistenerwrapper) throws CommandSyntaxException {
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index dfa719716efdb93b2f4440916bef70971a2a404d..b66338f3658aeded6264a8f522c9d60f9b426a04 100644
+index 50ba26eafcfd5024e2795f13a0b04877b2cd6688..fea2e70a92bfd9798a4a8e256069dc20889e1259 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -77,6 +77,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -122,7 +122,7 @@ index dfa719716efdb93b2f4440916bef70971a2a404d..b66338f3658aeded6264a8f522c9d60f
  
      @Override
      public CraftHumanEntity getBukkitEntity() {
-@@ -1883,6 +1884,15 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1890,6 +1891,15 @@ public abstract class EntityHuman extends EntityLiving {
          return this.getProfile().getName();
      }
  
diff --git a/patches/server/0041-PlayerAttackEntityEvent.patch b/patches/server/0041-PlayerAttackEntityEvent.patch
index b37f3e94..a8cf7b3b 100644
--- a/patches/server/0041-PlayerAttackEntityEvent.patch
+++ b/patches/server/0041-PlayerAttackEntityEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttackEntityEvent
 Added per request
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b66338f3658aeded6264a8f522c9d60f9b426a04..08c1e85e1fcc55f647d238729870e84b7c55f598 100644
+index fea2e70a92bfd9798a4a8e256069dc20889e1259..dddc6aff8c11f9f4f295c864465ef9a128d0362e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1049,11 +1049,47 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/patches/server/0056-Smarter-statistics-ticking.patch b/patches/server/0056-Smarter-statistics-ticking.patch
index ef6a18c0..6720a17b 100644
--- a/patches/server/0056-Smarter-statistics-ticking.patch
+++ b/patches/server/0056-Smarter-statistics-ticking.patch
@@ -8,7 +8,7 @@ In vanilla, statistics that count time spent for an action (i.e. time played or
 With an interval of 20, this patch saves roughly 3ms per tick on a server w/ 80 players online.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 08c1e85e1fcc55f647d238729870e84b7c55f598..4b19f01c891b23a8da7a39d6ae63f229bcb8e198 100644
+index dddc6aff8c11f9f4f295c864465ef9a128d0362e..0046dedd5e5f503ee680b89ec7e3dca681c26686 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -163,18 +163,23 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/patches/server/0059-Infinity-No-Arrows.patch b/patches/server/0059-Infinity-No-Arrows.patch
index a9d32ee7..2a510616 100644
--- a/patches/server/0059-Infinity-No-Arrows.patch
+++ b/patches/server/0059-Infinity-No-Arrows.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Infinity No Arrows
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4b19f01c891b23a8da7a39d6ae63f229bcb8e198..fab44dafa479a97a69499b6af500e45c77612c81 100644
+index 0046dedd5e5f503ee680b89ec7e3dca681c26686..4412d465afcab66a1922217c931e73dcf559631c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -2137,7 +2137,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2144,7 +2144,7 @@ public abstract class EntityHuman extends EntityLiving {
                      }
                  }
  
diff --git a/patches/server/0062-Use-faster-random-implementation.patch b/patches/server/0062-Use-faster-random-implementation.patch
index ebe399a1..451482c9 100644
--- a/patches/server/0062-Use-faster-random-implementation.patch
+++ b/patches/server/0062-Use-faster-random-implementation.patch
@@ -58,7 +58,7 @@ index 38dc6086d18951e065d4048d1d8eee288c5c5fd1..4e094f0e1117cecbd39be645997eb9d3
  
          this.f = ShapeDetectorBuilder.a().a("       ", "       ", "       ", "   #   ", "       ", "       ", "       ").a("       ", "       ", "       ", "   #   ", "       ", "       ", "       ").a("       ", "       ", "       ", "   #   ", "       ", "       ", "       ").a("  ###  ", " #   # ", "#     #", "#  #  #", "#     #", " #   # ", "  ###  ").a("       ", "  ###  ", " ##### ", " ##### ", " ##### ", "  ###  ", "       ").a('#', ShapeDetectorBlock.a(BlockPredicate.a(Blocks.BEDROCK))).b();
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0bca08dc6ffd367de7cffab0433900d6bfe555cf..51c4ff1bd6948ab46d723c37af39c76cdf662be5 100644
+index cc5d3fe169d02216a828a83be0f83f84c117cde9..2bacecb9cee2f93b142d63b9a79641d7bac8f868 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -61,7 +61,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke