diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
index 2830f7dff..509c29703 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/api/0006-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <zml@stellardrift.ca>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e4123d5f918a5f21b7f6fddba7084643f86ad5aa..f4fc0aea0b965d786b7384dcb6634885527fd8da 100644
+index 9fe78a9570f7e8dd4c6f94fc3fb1bf176c1481d2..3a36b2b7f38e3446177f0883083d30c739f6c9b1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -19,6 +19,11 @@ dependencies {
@@ -2262,10 +2262,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..a01d4c21bedc7f1a54f5a330bb4c2909
       * Gets how much EXP the Player should have at respawn.
       * <p>
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index f1e9bc9bc797b7216336d3470e3c696a06f2b21a..090d22bd30f7947103771aaaf09a2398970ac337 100644
+index 441362d2fbdc9413ed64a1f00b50fb6d06327e79..e1e7f45fd0f65d0874dd0698da436c7ac2e7951b 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -136,6 +136,18 @@ public enum InventoryType {
+@@ -140,6 +140,18 @@ public enum InventoryType {
      private final String title;
      private final boolean isCreatable;
  
@@ -2284,7 +2284,7 @@ index f1e9bc9bc797b7216336d3470e3c696a06f2b21a..090d22bd30f7947103771aaaf09a2398
      private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
          this(defaultSize, defaultTitle, true);
      }
-@@ -144,6 +156,7 @@ public enum InventoryType {
+@@ -148,6 +160,7 @@ public enum InventoryType {
          size = defaultSize;
          title = defaultTitle;
          this.isCreatable = isCreatable;
@@ -2292,7 +2292,7 @@ index f1e9bc9bc797b7216336d3470e3c696a06f2b21a..090d22bd30f7947103771aaaf09a2398
      }
  
      public int getDefaultSize() {
-@@ -151,6 +164,7 @@ public enum InventoryType {
+@@ -155,6 +168,7 @@ public enum InventoryType {
      }
  
      @NotNull
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index 695f30e81..f9989545a 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -67,7 +67,7 @@ index 393f282ea082772593ae34c0b3d3dcd2ea9e4c52..ffb7b25b01bc26e3234358e39633c7f7
          "org.eclipse.aether", "org.eclipse.sisu", "org.objectweb.asm"
      ).forEach { pack ->
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index dfe101d9f5db1bd7cfc59dfe9adc9abb643586cc..24e08ca0fca3e87f8a6b7670b266f3c2900b798c 100644
+index b06a4c8f5e1dfcbda171910279d6861dc3d4d2e7..358475974cf7dfced302bdd7d2390bd95848c737 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -190,7 +190,7 @@ public class Main {
@@ -78,7 +78,7 @@ index dfe101d9f5db1bd7cfc59dfe9adc9abb643586cc..24e08ca0fca3e87f8a6b7670b266f3c2
 +                    Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
diff --git a/patches/server/0009-Timings-v2.patch b/patches/server/0009-Timings-v2.patch
index f70c11a22..65110823c 100644
--- a/patches/server/0009-Timings-v2.patch
+++ b/patches/server/0009-Timings-v2.patch
@@ -767,7 +767,7 @@ index b3a6aeba2363d283f03982cf749f25cfa11a5052..449f1b2f5dca350dc0912e14c8c2bf3e
                      PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: {}", packet);
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 224128235f712c3dc8588b3a5cdd3e776b9c0aba..9f7b60c74ccc46b7677ccfe487367cd4793b8287 100644
+index 1b76d1b929b85b130639e7937a118342b568e795..4985aa808fa378ab0463470d4635fda9cc15d268 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -183,7 +183,7 @@ import org.bukkit.craftbukkit.Main;
@@ -1141,7 +1141,7 @@ index 2014ba4857e07092de4c3179149563b0ff284e56..fe785c42b6eca6dafb28ffb6b7afaf44
  
      public void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 2427b2cfb52c0e6aee1397c9951c1aa1c0f14503..8746654a1c1b3b6cb1cabb468c0498aada17d517 100644
+index db2bcc20d50f1833347f6edde67c366501d29c0f..e3abeb839c36b5238ec115329ce05b58e3383a55 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -349,13 +349,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -1240,7 +1240,7 @@ index 2427b2cfb52c0e6aee1397c9951c1aa1c0f14503..8746654a1c1b3b6cb1cabb468c0498aa
  
      private void getFullChunk(long pos, Consumer<LevelChunk> chunkConsumer) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0127e3ab8d4e65c802c9b44d081cc0d51946e473..94c5631820590d31cfd4e8a4fb2395dd6b395841 100644
+index bcfc6ea89aa3b1df92d2b181d1d23902859e2584..5c5cfc31ced6695af7b1dd06cb867274fa38d85f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,6 +1,8 @@
@@ -1338,7 +1338,7 @@ index 0127e3ab8d4e65c802c9b44d081cc0d51946e473..94c5631820590d31cfd4e8a4fb2395dd
 +        timer = entity.getVehicle() != null ? entity.getType().passengerTickTimer.startTiming() : entity.getType().tickTimer.startTiming();
 +        try {
 +        // Paper end - timings
-         entity.isInLava();
+         entity.setOldPosAndRot();
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
 @@ -820,7 +834,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index b7fa971c0..63e761acf 100644
--- a/patches/server/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -19,7 +19,7 @@ index 2c53a400611c78236c5a1c1270d27c02e94251bf..a1d5c0f8fe2adb2ee56f3217e089211e
                      if (outputStream != null) {
                          try {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9f7b60c74ccc46b7677ccfe487367cd4793b8287..3a9d77a190ef96c06717ee00bcfba52b8f984c14 100644
+index 4985aa808fa378ab0463470d4635fda9cc15d268..5b68bc18c39bb34a188782b36da59a5d5280bdd9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1418,7 +1418,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -32,7 +32,7 @@ index 9f7b60c74ccc46b7677ccfe487367cd4793b8287..3a9d77a190ef96c06717ee00bcfba52b
  
      public SystemReport fillSystemReport(SystemReport systemreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d2e2e0cab3035a6a458fde75e9fcf72b2d1e77dd..cbf84099f473115559c5344782618c2ab9c86582 100644
+index e2564dee0603735d135d1de2af6801a0f2a93e7d..f00844d2953e6ead58bfd383a214695b3dbe5086 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -227,7 +227,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -45,11 +45,11 @@ index d2e2e0cab3035a6a458fde75e9fcf72b2d1e77dd..cbf84099f473115559c5344782618c2a
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4df6b2a155a610953d8d5789bffa33d290d62aaa..399cb06c7ae3570d08430e8675f141657d1026d4 100644
+index 3fd48807c554b176cd8e925bdcd68e7f808e5881..9aea2ecf232c91817ae0ff70b3343aa8a97962c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -210,12 +210,25 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
                          System.err.println("*** Error, this build is outdated ***");
 -                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***");
diff --git a/patches/server/0040-Use-UserCache-for-player-heads.patch b/patches/server/0040-Use-UserCache-for-player-heads.patch
index 3be79b349..e13ca0bfd 100644
--- a/patches/server/0040-Use-UserCache-for-player-heads.patch
+++ b/patches/server/0040-Use-UserCache-for-player-heads.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use UserCache for player heads
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 354dcb1ddf74f39e367d50a8b8e2beeb9b2f9d02..b19d50bbe6c944ff66230ac013178bd036a438c8 100644
+index 6432f668f72c0543283b5a1439d01da81ff5b981..9405812b8c308d70de1e26ba55500301b24ecc3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -166,7 +166,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -168,7 +168,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          if (name == null) {
              this.setProfile(null);
          } else {
diff --git a/patches/server/0153-Fix-this-stupid-bullshit.patch b/patches/server/0153-Fix-this-stupid-bullshit.patch
index 52308387e..f7f391408 100644
--- a/patches/server/0153-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0153-Fix-this-stupid-bullshit.patch
@@ -31,12 +31,12 @@ index c7d5018cb6acef12e6da90626c75543ac279a101..64576ddd8363be55755fa50d1c16d95e
              Bootstrap.isBootstrapped = true;
              if (Registry.REGISTRY.keySet().isEmpty()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b4bcd34123968b3930bb330f7c2abd9b5518fa31..f68d44721c91c20a7e4abffe26dabff8b5d2c3ce 100644
+index 787db22e4d7df30ccf3d92297fbd2f08ff87beb5..b14fa970679dc000cd203949c73f117d4573be9e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -228,10 +228,12 @@ public class Main {
                      Calendar deadline = Calendar.getInstance();
-                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     deadline.add(Calendar.DAY_OF_YEAR, -7);
                      if (buildDate.before(deadline.getTime())) {
 -                        System.err.println("*** Error, this build is outdated ***");
 +                        // Paper start - This is some stupid bullshit
diff --git a/patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch
index 8c638a6d9..04752f751 100644
--- a/patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch
@@ -40,7 +40,7 @@ index 1879ae835c437883f76330d6e2707460273d02db..df0ba7ed56fc635a4aa30934d1990043
      public BlockFace getRotation() {
          BlockData blockData = getBlockData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 5e345224e698bd80133dc194385c033369a60a33..33994a050826d10d69f375f65ecce2b56116cca0 100644
+index 490df0dcfd0e1e0ab05943410493522f86444ef8..7cacc61fed0c610845c67894d1cc68e44f5e46fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -4,10 +4,8 @@ import com.google.common.collect.ImmutableMap.Builder;
@@ -68,7 +68,7 @@ index 5e345224e698bd80133dc194385c033369a60a33..33994a050826d10d69f375f65ecce2b5
  @DelegateDeserialization(SerializableMeta.class)
  class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
  
-@@ -149,6 +152,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -151,6 +154,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          return this.hasOwner() ? this.profile.getName() : null;
      }
  
diff --git a/patches/server/0259-Inventory-removeItemAnySlot.patch b/patches/server/0259-Inventory-removeItemAnySlot.patch
index 0582ff7e5..533e72fb4 100644
--- a/patches/server/0259-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0259-Inventory-removeItemAnySlot.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 758bbe839b71917b594fdb8c9cd66cda0aa4745c..56bd3290fdf011590594d68128eb3fe9ca71506c 100644
+index d76d70e7031a643f697a8ec13471450de2bca705..6ca8e76d1569f3f631275fea187e7110f09fc69e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -222,10 +222,16 @@ public class CraftInventory implements Inventory {
+@@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
      }
  
      private int first(ItemStack item, boolean withAmount) {
@@ -26,7 +26,7 @@ index 758bbe839b71917b594fdb8c9cd66cda0aa4745c..56bd3290fdf011590594d68128eb3fe9
          for (int i = 0; i < inventory.length; i++) {
              if (inventory[i] == null) continue;
  
-@@ -348,6 +354,17 @@ public class CraftInventory implements Inventory {
+@@ -349,6 +355,17 @@ public class CraftInventory implements Inventory {
  
      @Override
      public HashMap<Integer, ItemStack> removeItem(ItemStack... items) {
@@ -44,7 +44,7 @@ index 758bbe839b71917b594fdb8c9cd66cda0aa4745c..56bd3290fdf011590594d68128eb3fe9
          Validate.notNull(items, "Items cannot be null");
          HashMap<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
  
-@@ -358,7 +375,10 @@ public class CraftInventory implements Inventory {
+@@ -359,7 +376,10 @@ public class CraftInventory implements Inventory {
              int toDelete = item.getAmount();
  
              while (true) {
diff --git a/patches/server/0365-Entity-Activation-Range-2.0.patch b/patches/server/0365-Entity-Activation-Range-2.0.patch
index 9f184220c..05b6980e2 100644
--- a/patches/server/0365-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0365-Entity-Activation-Range-2.0.patch
@@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
 Adds villagers as separate config
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9f53a439fe196f2347dd4eb5b05c1fe80beb593f..256ae7b9e587402648133498e35fa18f8c0be455 100644
+index 4c675656ea210fee7778a6d93268157bce010878..43326e1cfe9666202f8ede4b653643496dceaff7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -62,7 +62,7 @@ index 9f53a439fe196f2347dd4eb5b05c1fe80beb593f..256ae7b9e587402648133498e35fa18f
 +        timer = isActive ? entity.getType().tickTimer.startTiming() : entity.getType().inactiveTickTimer.startTiming(); // Paper
          try {
          // Paper end - timings
-         entity.isInLava();
+         entity.setOldPosAndRot();
 @@ -912,9 +909,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              return Registry.ENTITY_TYPE.getKey(entity.getType()).toString();
          });
@@ -124,7 +124,7 @@ index 9f53a439fe196f2347dd4eb5b05c1fe80beb593f..256ae7b9e587402648133498e35fa18f
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 413d86b15c245a17246e23611cd65739e8fd18dd..4185041c576349adc14d20926d0f7ddd00145c53 100644
+index 4780d9307af7ad7ca6e7e056f73708ba496ee9db..0e01982d93a29998d0f4ed3409bb871ea162f3f6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -326,6 +326,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -158,7 +158,7 @@ index 413d86b15c245a17246e23611cd65739e8fd18dd..4185041c576349adc14d20926d0f7ddd
              movement = this.maybeBackOffFromEdge(movement, movementType);
              Vec3 vec3d1 = this.collide(movement);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 9c208d24d6f84e8818c0a7b88cdcb7c2fd703f91..623fd2220007eec7a8e799a647e7c657aae5ee6d 100644
+index 0fdfa0350ae8cd76bed3fec390da403a4668cc28..e5ad2b5eb3ac4e068239c0e490ea47ed7cfc8106 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -198,6 +198,19 @@ public abstract class Mob extends LivingEntity {
@@ -317,7 +317,7 @@ index 555cf6d39108d40998adbbaf6b09dd9973f5f2e3..426fa33c9e5ddf2de5435859ee4a5f35
          super.customServerAiStep();
      }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e8b935aa953d19f5617440dbdb8a763a440a0c82..a689ae14c01206940d1fc4ce8cea3410b601d71d 100644
+index 6acff46faa03842567d5fe81609bec6ea7922c21..dea7d392d12ce088fd0708e73a5938d77b10069c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -154,6 +154,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch
index 888e64518..dca3e657d 100644
--- a/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Inventory getHolder method without block snapshot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 56bd3290fdf011590594d68128eb3fe9ca71506c..7850dfa9130761905030856786a97a008c700687 100644
+index 6ca8e76d1569f3f631275fea187e7110f09fc69e..7d8f29335d4c5188527cad66be39cedb34c26f50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -525,6 +525,13 @@ public class CraftInventory implements Inventory {
+@@ -528,6 +528,13 @@ public class CraftInventory implements Inventory {
          return this.inventory.getOwner();
      }
  
diff --git a/patches/server/0677-Inventory-close.patch b/patches/server/0677-Inventory-close.patch
index 8bfd99aed..e21cf25bc 100644
--- a/patches/server/0677-Inventory-close.patch
+++ b/patches/server/0677-Inventory-close.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Inventory#close
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 7850dfa9130761905030856786a97a008c700687..01701e50dd0ce1c46dcc27ea7da8f51d45899a8c 100644
+index 7d8f29335d4c5188527cad66be39cedb34c26f50..396a4ae3d5a829eda78ef98561333aea300aa722 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -447,6 +447,14 @@ public class CraftInventory implements Inventory {
+@@ -448,6 +448,14 @@ public class CraftInventory implements Inventory {
              this.clear(i);
          }
      }
diff --git a/work/Bukkit b/work/Bukkit
index ebb0e28d1..2dbec5842 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit ebb0e28d11747aa0bb4bb39fad8979ccfaa925b6
+Subproject commit 2dbec584278268fc46bfb5520fd18bde18d33308
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f992ce609..9122f5a6e 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f992ce6097f846ed5967fc797d98ae3e84ef1b10
+Subproject commit 9122f5a6e02e52b50ba61b8073137365d1167f30
diff --git a/work/Spigot b/work/Spigot
index 9472b09d5..101ebb63b 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 9472b09d5fa46afc41871d063689b5ddd89764b3
+Subproject commit 101ebb63b2531abf0ac868af41d57322d05931fa