diff --git a/build.gradle.kts b/build.gradle.kts
index d146d5118..cb197edc1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "7.1.2" apply false
-    id("io.papermc.paperweight.patcher") version "1.3.4"
+    id("io.papermc.paperweight.patcher") version "1.3.5"
 }
 
 repositories {
diff --git a/gradle.properties b/gradle.properties
index 1170f81ad..f0286df0d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 group=com.lokamc.slice
-version=1.18-R0.1-SNAPSHOT
+version=1.18.2-R0.1-SNAPSHOT
 
-mcVersion=1.18
-paperRef=30cb7d0407bfb01a3bc0cc2da1dc0af32dfae5a4
+mcVersion=1.18.2
+paperRef=63aa4d33194cae156d1bed840868336cda6bc52b
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index b122813b0..e8d83173e 100644
--- a/patches/server/0001-Build-changes.patch
+++ b/patches/server/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 4662952bd0a389fe77e00ede9ab4a57f33522794..3e647d6015313a4545e9ccd03334f8d3a9b4e088 100644
+index 4beb35d1e5b013395f5df101e843f41c2ce174ad..cc2e1f98da222117d378a109124644412d25810f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,8 +18,12 @@ repositories {
@@ -42,10 +42,10 @@ index 4662952bd0a389fe77e00ede9ab4a57f33522794..3e647d6015313a4545e9ccd03334f8d3
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c847a2b935130a293d9ac4c196c9cff27470649b..4ec29c98c951c1665dcef02f1da38fab752505b4 100644
+index 07c382f30ed3736ed15b5b71f48dc4a1de958242..2e8ec4dce4962420840d04600ec0ce2ae40f585c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1719,7 +1719,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -55,10 +55,10 @@ index c847a2b935130a293d9ac4c196c9cff27470649b..4ec29c98c951c1665dcef02f1da38fab
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 51f67a2944034552d57b939ef29e0249e74383b9..379f5597430e43178fc1d1baa3b5097a4455d97b 100644
+index 7343bd96a4a15f4abc081e565175db8df930a470..def3cbb36c3ae5efb1fad8c32cc501840c60dc87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
+@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -68,7 +68,7 @@ index 51f67a2944034552d57b939ef29e0249e74383b9..379f5597430e43178fc1d1baa3b5097a
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..c232c54606b465b65305a8bcd112fbb52d921b8a 100644
+index 774556a62eb240da42e84db4502e2ed43495be17..fdd8fa9ec021b4846b59e1693e32d4d02a712efe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
diff --git a/patches/server/0002-Add-PlayerShieldDisableEvent.patch b/patches/server/0002-Add-PlayerShieldDisableEvent.patch
index 275370d58..98d2f3983 100644
--- a/patches/server/0002-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0002-Add-PlayerShieldDisableEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerShieldDisableEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 850a4f8a9bd1dc30b13205e158fcbfaa872d6157..aa9d0ec59d0bbba073d416cc40f273e7d7c4cd50 100644
+index b1ae9b0d8b229e2a6797a173cb11ecc0f43e2592..48e933f5d3f35e845bf7b0eed86ce5d9c2114bcf 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1609,6 +1609,7 @@ public abstract class Mob extends LivingEntity {
@@ -17,10 +17,10 @@ index 850a4f8a9bd1dc30b13205e158fcbfaa872d6157..aa9d0ec59d0bbba073d416cc40f273e7
                  this.level.broadcastEntityEvent(player, (byte) 30);
              }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d85da02be7f1d494af8f2cc840c49073774f5f9c..2c0c9019245e94a4c89c948eafa837a7d6279b7e 100644
+index 9c767096ca950d55d6002282c7a3fe2884bcd630..09d649f1b3236805cad461f2d826758daf41d14e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -933,7 +933,7 @@ public abstract class Player extends LivingEntity {
+@@ -946,7 +946,7 @@ public abstract class Player extends LivingEntity {
      protected void blockUsingShield(LivingEntity attacker) {
          super.blockUsingShield(attacker);
          if (attacker.getMainHandItem().getItem() instanceof AxeItem) {
@@ -29,7 +29,7 @@ index d85da02be7f1d494af8f2cc840c49073774f5f9c..2c0c9019245e94a4c89c948eafa837a7
          }
  
      }
-@@ -1404,6 +1404,12 @@ public abstract class Player extends LivingEntity {
+@@ -1417,6 +1417,12 @@ public abstract class Player extends LivingEntity {
      }
  
      public void disableShield(boolean sprinting) {
@@ -42,7 +42,7 @@ index d85da02be7f1d494af8f2cc840c49073774f5f9c..2c0c9019245e94a4c89c948eafa837a7
          float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F;
  
          if (sprinting) {
-@@ -1411,6 +1417,8 @@ public abstract class Player extends LivingEntity {
+@@ -1424,6 +1430,8 @@ public abstract class Player extends LivingEntity {
          }
  
          if (this.random.nextFloat() < f) {
diff --git a/patches/server/0003-Set-BlockData-without-light-update.patch b/patches/server/0003-Set-BlockData-without-light-update.patch
index f8f63b7be..883216989 100644
--- a/patches/server/0003-Set-BlockData-without-light-update.patch
+++ b/patches/server/0003-Set-BlockData-without-light-update.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Set BlockData without light update
 
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 9b25d36fe5230e287d81b99be31b9eddd8e76002..2477b1edc73f295414dd67acfd16e17c100e4260 100644
+index a24f605bd033f249a374e83ba094880106260eee..192e0a7be3ebe1ddd30af478928e581bfdd229a6 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-@@ -226,7 +226,7 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -225,7 +225,7 @@ public class WorldGenRegion implements WorldGenLevel {
                  Block.dropResources(iblockdata, this.level, pos, tileentity, breakingEntity, ItemStack.EMPTY);
              }
  
@@ -17,7 +17,7 @@ index 9b25d36fe5230e287d81b99be31b9eddd8e76002..2477b1edc73f295414dd67acfd16e17c
          }
      }
  
-@@ -292,7 +292,7 @@ public class WorldGenRegion implements WorldGenLevel {
+@@ -291,7 +291,7 @@ public class WorldGenRegion implements WorldGenLevel {
      }
  
      @Override
@@ -27,10 +27,10 @@ index 9b25d36fe5230e287d81b99be31b9eddd8e76002..2477b1edc73f295414dd67acfd16e17c
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 11e146241a01ab9ec206b9d3f39aebf5c201a16e..fb283572b11ed6e482ada401c44d40c9c5e37367 100644
+index 160c0f37aa3aaf7598f852acf9bd444f79444c97..8b6ea24dc8d0286c0814c86dcf4c51cacc572854 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -538,12 +538,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -495,12 +495,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      @Override
@@ -46,7 +46,7 @@ index 11e146241a01ab9ec206b9d3f39aebf5c201a16e..fb283572b11ed6e482ada401c44d40c9
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
              // Paper start
-@@ -590,7 +590,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -547,7 +547,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              } else {
                  BlockState iblockdata2 = this.getBlockState(pos);
  
@@ -55,7 +55,7 @@ index 11e146241a01ab9ec206b9d3f39aebf5c201a16e..fb283572b11ed6e482ada401c44d40c9
                      this.getProfiler().push("queueCheckLight");
                      this.getChunkSource().getLightEngine().checkBlock(pos);
                      this.getProfiler().pop();
-@@ -737,7 +737,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -694,7 +694,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  Block.dropResources(iblockdata, this, pos, tileentity, breakingEntity, ItemStack.EMPTY);
              }
  
@@ -86,10 +86,10 @@ index 134e5ec79bf2dddd4e31930f8a7cb2c02fa29518..fd72d278a2719911a46b6bc9e7da2dc2
  
      boolean removeBlock(BlockPos pos, boolean move);
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index ab5b9f00123e2ede2931ffc520684e482aac49b4..e88e46aac3fa07a330c9f686f563c6d5fbfa3d70 100644
+index a80f4dc0a642c744223a155232291ace6e007636..fda1cb8ac3fa78375d90d6bc9f05a78f58d18193 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -195,7 +195,7 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -196,7 +196,7 @@ public class Block extends BlockBehaviour implements ItemLike {
                      world.destroyBlock(pos, (flags & 32) == 0, (Entity) null, maxUpdateDepth);
                  }
              } else {
@@ -99,7 +99,7 @@ index ab5b9f00123e2ede2931ffc520684e482aac49b4..e88e46aac3fa07a330c9f686f563c6d5
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index abd9429ece67fc1649750a77045c8157c57309a1..2c83041140b455d57ec09a59ba59bc436e726dab 100644
+index 850131e601047ab1c585a6f8883ac3c0d0e97ba1..54028d0892e09d521afa628c4c2a8efa4d78d463 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -263,7 +263,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -112,10 +112,10 @@ index abd9429ece67fc1649750a77045c8157c57309a1..2c83041140b455d57ec09a59ba59bc43
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 5ea2fdbd2c762e0e632093fc07294327eb061ada..01b904b8cc32bcb1e665db773dafa0adfb4c5b55 100644
+index c18edb2c0680a336f11fab30d1d985192dc1393e..f3894c3eb83b67a03a401a1fcebfdc9e95e9e4b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -178,15 +178,20 @@ public class CraftBlock implements Block {
+@@ -180,15 +180,20 @@ public class CraftBlock implements Block {
  
      @Override
      public void setBlockData(BlockData data, boolean applyPhysics) {
@@ -140,7 +140,7 @@ index 5ea2fdbd2c762e0e632093fc07294327eb061ada..01b904b8cc32bcb1e665db773dafa0ad
          // SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup
          if (old.hasBlockEntity() && blockData.getBlock() != old.getBlock()) { // SPIGOT-3725 remove old tile entity if block changes
              // SPIGOT-4612: faster - just clear tile
-@@ -200,7 +205,7 @@ public class CraftBlock implements Block {
+@@ -202,7 +207,7 @@ public class CraftBlock implements Block {
          if (applyPhysics) {
              return world.setBlock(position, blockData, 3);
          } else {
@@ -163,10 +163,10 @@ index 966ac60daebb7bb211ab8096fc0c5f33db67320a..d68b046e30d0f3d186ed90b7c36086cc
              this.world.getHandle().sendBlockUpdated(
                      position,
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index 4c6cbfbcb5a7876e6b556b59c54e9a4cedf7843e..0cec147b0c291ab92b1fc93df40bf39c473d862a 100644
+index 34e2e14ebb007cceb8b64d3eb321646e834215d4..c0428b6e1cc9f2ca84b3ee718e28b15ce496261c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-@@ -245,7 +245,7 @@ public class DummyGeneratorAccess implements WorldGenLevel {
+@@ -238,7 +238,7 @@ public class DummyGeneratorAccess implements WorldGenLevel {
      }
  
      @Override
diff --git a/patches/server/0004-Don-t-send-equipment-updates-if-only-durability-chan.patch b/patches/server/0004-Don-t-send-equipment-updates-if-only-durability-chan.patch
index 565b24438..82ffe3078 100644
--- a/patches/server/0004-Don-t-send-equipment-updates-if-only-durability-chan.patch
+++ b/patches/server/0004-Don-t-send-equipment-updates-if-only-durability-chan.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't send equipment updates if only durability changed
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9822d163a9e4d6ac8240c18a7082e911788d0948..1d17ba9aa5f6de7e6f14f0a2aeb7f322f74ce90f 100644
+index fdd76d1a1636f30f519c434b41061d826c4a8261..39980b411528f148ed27099669d1acc6cb332c18 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3028,7 +3028,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3031,7 +3031,7 @@ public abstract class LivingEntity extends Entity {
  
              ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
  
diff --git a/patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch b/patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch
index de2bafe97..d58802554 100644
--- a/patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch
+++ b/patches/server/0006-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't send fire packets if player has Fire Resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9ca080e2745686fc2e39485965ec54c5de0bae6e..d0daee81837fe64ac766e615d0a0bbb891de3306 100644
+index 84fce7dccf9232209f939a32acfc3131e62eb27c..a57d8aa70fe3df462279c494686056459dc70271 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -776,7 +776,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -780,7 +780,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
  
          this.checkOutOfWorld();
          if (!this.level.isClientSide) {
diff --git a/patches/server/0007-Track-Player-throughout-block-destroy.patch b/patches/server/0007-Track-Player-throughout-block-destroy.patch
index 3218e7b8b..11be3b633 100644
--- a/patches/server/0007-Track-Player-throughout-block-destroy.patch
+++ b/patches/server/0007-Track-Player-throughout-block-destroy.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Track Player throughout block destroy
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index cc5dbc86c8265540948e6b1445d84ecf0b7762aa..170f58e56c6a6cae26f7c9e55c74c3c3074500da 100644
+index 891199d02539fa46454cd0aa7c133637e5dc8235..aa9c5c26b69db883ff933d35d0c99425e95ad455 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -441,6 +441,7 @@ public class ServerPlayerGameMode {
+@@ -451,6 +451,7 @@ public class ServerPlayerGameMode {
                  org.bukkit.block.BlockState state = bblock.getState();
                  level.captureDrops = new ArrayList<>();
                  // CraftBukkit end
@@ -16,7 +16,7 @@ index cc5dbc86c8265540948e6b1445d84ecf0b7762aa..170f58e56c6a6cae26f7c9e55c74c3c3
                  block.playerWillDestroy(this.level, pos, iblockdata, this.player);
                  boolean flag = this.level.removeBlock(pos, false);
  
-@@ -465,6 +466,7 @@ public class ServerPlayerGameMode {
+@@ -475,6 +476,7 @@ public class ServerPlayerGameMode {
                  // CraftBukkit start
                  java.util.List<net.minecraft.world.entity.item.ItemEntity> itemsToDrop = level.captureDrops; // Paper - store current list
                  level.captureDrops = null; // Paper - Remove this earlier so that we can actually drop stuff
@@ -25,10 +25,10 @@ index cc5dbc86c8265540948e6b1445d84ecf0b7762aa..170f58e56c6a6cae26f7c9e55c74c3c3
                      org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - use stored ref
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 8bd12326e591213f0a093b96a5af3f04e19dc980..aeff3a9cc6b3531cb0d690bf574094cb525f57eb 100644
+index dc4639f905fb71435daf29c61f64621a3e2cc533..32e210e52ce86791965869cb75869a4b506e4a5f 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -323,6 +323,7 @@ public final class ItemStack {
+@@ -333,6 +333,7 @@ public final class ItemStack {
                  }
              }
              Item item = this.getItem();
@@ -37,10 +37,10 @@ index 8bd12326e591213f0a093b96a5af3f04e19dc980..aeff3a9cc6b3531cb0d690bf574094cb
              CompoundTag newData = this.getTagClone();
              int newCount = this.getCount();
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fb283572b11ed6e482ada401c44d40c9c5e37367..d8ef17bc72388046e3f428c108aaaecd02d4eed3 100644
+index 8b6ea24dc8d0286c0814c86dcf4c51cacc572854..6764f174d0685c02d5e81aa38228d02a77bf9632 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -174,6 +174,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -172,6 +172,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
      public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
  
@@ -68,7 +68,7 @@ index fb283572b11ed6e482ada401c44d40c9c5e37367..d8ef17bc72388046e3f428c108aaaecd
      // Paper start - fix and optimise world upgrading
      // copied from below
      public static ResourceKey<DimensionType> getDimensionKey(DimensionType manager) {
-@@ -692,6 +713,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -649,6 +670,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (!this.preventPoiUpdated) {
                  this.onBlockStateChange(blockposition, iblockdata1, iblockdata2);
              }
@@ -76,7 +76,7 @@ index fb283572b11ed6e482ada401c44d40c9c5e37367..d8ef17bc72388046e3f428c108aaaecd
              // CraftBukkit end
          }
      }
-@@ -797,8 +819,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -754,8 +776,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public void neighborChanged(BlockPos pos, Block sourceBlock, BlockPos neighborPos) {
          if (!this.isClientSide) {
              BlockState iblockdata = this.getBlockState(pos);
@@ -115,10 +115,10 @@ index e12b76238cb52a1007f2102473b7f892f8521b62..301dfb74fec49b7f6f0452e4c49c8f1d
                  BlockState iblockdata2 = iblockdata1.hasProperty(BlockStateProperties.WATERLOGGED) && (Boolean) iblockdata1.getValue(BlockStateProperties.WATERLOGGED) ? Blocks.WATER.defaultBlockState() : Blocks.AIR.defaultBlockState();
  
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index eac017fc521bfd1391e75db8628f42b28329d681..b19164ca156f76e61cac17c4d924f14845d49148 100644
+index 61590f2f04a797235299f1bd6b78a08f5bfe4a33..9f757e1f0287f9146298ce6c09bb7aa207edbbc2 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-@@ -966,6 +966,18 @@ public abstract class BlockBehaviour {
+@@ -968,6 +968,18 @@ public abstract class BlockBehaviour {
  
                  blockposition_mutableblockposition.setWithOffset(pos, enumdirection);
                  BlockState iblockdata = world.getBlockState(blockposition_mutableblockposition);
diff --git a/patches/server/0008-Add-BlockDestroyedByNeighborEvent.patch b/patches/server/0008-Add-BlockDestroyedByNeighborEvent.patch
index b5439c777..f38a3d355 100644
--- a/patches/server/0008-Add-BlockDestroyedByNeighborEvent.patch
+++ b/patches/server/0008-Add-BlockDestroyedByNeighborEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add BlockDestroyedByNeighborEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d8ef17bc72388046e3f428c108aaaecd02d4eed3..f2a9da819243a140550a37b2b17182f70c01fddd 100644
+index 6764f174d0685c02d5e81aa38228d02a77bf9632..0bd21a1eeb33ffb7e3299d864e8160627d6f88d9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -735,6 +735,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -692,6 +692,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          if (iblockdata.isAir()) {
              return false;
          } else {
diff --git a/patches/server/0009-Add-Player-to-SpongeAbsorbEvent.patch b/patches/server/0009-Add-Player-to-SpongeAbsorbEvent.patch
index 926f84345..07a60e6f3 100644
--- a/patches/server/0009-Add-Player-to-SpongeAbsorbEvent.patch
+++ b/patches/server/0009-Add-Player-to-SpongeAbsorbEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player to SpongeAbsorbEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-index 842997ea9f25a05d74a2e8300e44cc39a7e9cd96..e3cd6125a0248f6f68cbb126fedcdb1f6447bef0 100644
+index 11b40defd5f5362346fd8a70a1141cd6425cefa7..48541be0c1cbe33d4dad1158683ab25447ecf5cf 100644
 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
-@@ -110,7 +110,8 @@ public class SpongeBlock extends Block {
+@@ -109,7 +109,8 @@ public class SpongeBlock extends Block {
          if (!blocks.isEmpty()) {
              final org.bukkit.block.Block bblock = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
  
diff --git a/patches/server/0010-Add-provided-Material-to-getDrops.patch b/patches/server/0010-Add-provided-Material-to-getDrops.patch
index f6d905d26..09482023b 100644
--- a/patches/server/0010-Add-provided-Material-to-getDrops.patch
+++ b/patches/server/0010-Add-provided-Material-to-getDrops.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add provided Material to getDrops
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 01b904b8cc32bcb1e665db773dafa0adfb4c5b55..cacad8df8bc158f3434acea94f6b36b01a096aa2 100644
+index f3894c3eb83b67a03a401a1fcebfdc9e95e9e4b7..c13a49ea2886b4fa18bbe01df62b378bdecb4689 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -541,7 +541,18 @@ public class CraftBlock implements Block {
+@@ -547,7 +547,18 @@ public class CraftBlock implements Block {
  
      @Override
      public Collection<ItemStack> getDrops(ItemStack item, Entity entity) {
@@ -28,7 +28,7 @@ index 01b904b8cc32bcb1e665db773dafa0adfb4c5b55..cacad8df8bc158f3434acea94f6b36b0
          net.minecraft.world.item.ItemStack nms = CraftItemStack.asNMSCopy(item);
  
          // Modelled off EntityHuman#hasBlock
-@@ -552,6 +563,7 @@ public class CraftBlock implements Block {
+@@ -558,6 +569,7 @@ public class CraftBlock implements Block {
              return Collections.emptyList();
          }
      }
diff --git a/patches/server/0011-Allow-access-to-LightEngine.patch b/patches/server/0011-Allow-access-to-LightEngine.patch
index a51f4e641..033081e31 100644
--- a/patches/server/0011-Allow-access-to-LightEngine.patch
+++ b/patches/server/0011-Allow-access-to-LightEngine.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow access to LightEngine
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index afef3ea6d1ae5f145261eaae3da720fdf9e923a8..ca81340ad3dec12e1551d47a87a89a3d0207bd46 100644
+index edc6235288f0843608dae4552e05915e4067cbf2..73548e5fa318b84e9299ccac02a326bea86a6b11 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -641,7 +641,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -644,7 +644,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          return !ChunkMap.isChunkInRange(x1, z1, x2, z2, distance) ? false : (!ChunkMap.isChunkInRange(x1 + 1, z1, x2, z2, distance) ? true : (!ChunkMap.isChunkInRange(x1, z1 + 1, x2, z2, distance) ? true : (!ChunkMap.isChunkInRange(x1 - 1, z1, x2, z2, distance) ? true : !ChunkMap.isChunkInRange(x1, z1 - 1, x2, z2, distance))));
      }
  
diff --git a/patches/server/0012-Packet-obfuscation-and-reduction.patch b/patches/server/0012-Packet-obfuscation-and-reduction.patch
index 8509a4bd2..fb7dae16f 100644
--- a/patches/server/0012-Packet-obfuscation-and-reduction.patch
+++ b/patches/server/0012-Packet-obfuscation-and-reduction.patch
@@ -23,7 +23,7 @@ index 3e17f6131bf590d7c4a16b79c1c145cb4f565bc9..e1233fa58d068448d0accef7a7f6725f
          this.id = buf.readVarInt();
          this.packedItems = SynchedEntityData.unpack(buf);
 diff --git a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
-index 2e2bfccfc6cec6582a5b595e0343c27be5267b7a..77e5b55b6c1ea505c7fd11d5f9ee783c9ffa72f7 100644
+index 1d88edfd09a909044f6e3175af652914b4d06311..e4f8403c6544e1a00571f28954458a1412a6de58 100644
 --- a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
 +++ b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
 @@ -136,6 +136,11 @@ public class SynchedEntityData {
@@ -130,7 +130,7 @@ index 2e2bfccfc6cec6582a5b595e0343c27be5267b7a..77e5b55b6c1ea505c7fd11d5f9ee783c
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index b0a79e335ac9dc24fc6f18010bf40716ecc724bf..e4ba278cf42c4a946ddd3e1fefd07ae3b696cdc0 100644
+index 1092ba200a945d8d70e48f956535f56e2743302d..a7f2cc53a0b66d7cd3705f419337bd7ee8c78ec3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -371,7 +371,19 @@ public class ServerEntity {
@@ -155,11 +155,11 @@ index b0a79e335ac9dc24fc6f18010bf40716ecc724bf..e4ba278cf42c4a946ddd3e1fefd07ae3
  
          if (this.entity instanceof LivingEntity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d0daee81837fe64ac766e615d0a0bbb891de3306..dbee85771fa020295bc967b99ef8dd3fb67f4d3c 100644
+index a57d8aa70fe3df462279c494686056459dc70271..172d8008c2f5558962e889dd49f205b9a3800aa2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2971,7 +2971,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
-         if (event.isCancelled()) {
+@@ -3006,7 +3006,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+             this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
              return;
          }
 -        this.entityData.set(Entity.DATA_AIR_SUPPLY_ID, event.getAmount());
@@ -168,10 +168,10 @@ index d0daee81837fe64ac766e615d0a0bbb891de3306..dbee85771fa020295bc967b99ef8dd3f
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2c0c9019245e94a4c89c948eafa837a7d6279b7e..0d720d6d50de919a4a65278a73db7e4b639b6bc9 100644
+index 09d649f1b3236805cad461f2d826758daf41d14e..8cba5b6479792e46de5dfa566936bf28a482db3c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -631,7 +631,7 @@ public abstract class Player extends LivingEntity {
+@@ -632,7 +632,7 @@ public abstract class Player extends LivingEntity {
      public void increaseScore(int score) {
          int j = this.getScore();
  
@@ -179,9 +179,9 @@ index 2c0c9019245e94a4c89c948eafa837a7d6279b7e..0d720d6d50de919a4a65278a73db7e4b
 +        this.entityData.set(Player.DATA_SCORE_ID, j + score, 0); // Slice
      }
  
-     @Override
+     public void startAutoSpinAttack(int riptideTicks) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ef841a5ea1f634e87e5437faf83dc00efd590106..f7d25a63d80fed46f81f46e98e6a36bc8cfa5f88 100644
+index 603e9234294c01f1cde4bfc0b0053e69b99861d9..cc32c47e90b412950c810fef29ac097366a8f07f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2113,7 +2113,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0013-Smooth-world-teleports.patch b/patches/server/0013-Smooth-world-teleports.patch
index 13794fdf0..b34a353ab 100644
--- a/patches/server/0013-Smooth-world-teleports.patch
+++ b/patches/server/0013-Smooth-world-teleports.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Smooth world teleports
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 470dbed47830e2f580c090bc762a7be5cf389ce5..043c20cbde2abc56d37057fdeb15ca6f06d5e038 100644
+index e74c13e7aaa144fcd07036de70e80bebf0be698a..df879789ad494ffb897584e6c90d0221e767b90e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -258,6 +258,7 @@ public class ServerPlayer extends Player {
+@@ -256,6 +256,7 @@ public class ServerPlayer extends Player {
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
@@ -17,15 +17,15 @@ index 470dbed47830e2f580c090bc762a7be5cf389ce5..043c20cbde2abc56d37057fdeb15ca6f
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7a0c1ba40156df69bbbf36d96bed0950130d2351..36f6444c93636e6ccb7b1990564365292692105e 100644
+index 02dc93c394d37c9a84aa4a58d80615c403c54fb9..11a39f8acb3f490fb83d92c6297a4bb22e3b0e6b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -941,12 +941,12 @@ public abstract class PlayerList {
+@@ -948,12 +948,12 @@ public abstract class PlayerList {
          }
          // CraftBukkit start
          LevelData worlddata = worldserver1.getLevelData();
--        entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionType(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag));
-+        if (!entityplayer.smoothWorldTeleport) entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionType(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag));
+-        entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionTypeRegistration(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag));
++        if (!entityplayer.smoothWorldTeleport) entityplayer1.connection.send(new ClientboundRespawnPacket(worldserver1.dimensionTypeRegistration(), worldserver1.dimension(), BiomeManager.obfuscateSeed(worldserver1.getSeed()), entityplayer1.gameMode.getGameModeForPlayer(), entityplayer1.gameMode.getPreviousGameModeForPlayer(), worldserver1.isDebug(), worldserver1.isFlat(), flag));
          entityplayer1.connection.send(new ClientboundSetChunkCacheRadiusPacket(worldserver1.getChunkSource().chunkMap.playerChunkManager.getTargetSendDistance())); // Spigot // Paper - replace old player chunk management
          entityplayer1.connection.send(new ClientboundSetSimulationDistancePacket(worldserver1.getChunkSource().chunkMap.playerChunkManager.getTargetTickViewDistance())); // Spigot // Paper - replace old player chunk management
          entityplayer1.spawnIn(worldserver1);
diff --git a/patches/server/0014-World-Instance-flag.patch b/patches/server/0014-World-Instance-flag.patch
index 50cc16dc6..83c387995 100644
--- a/patches/server/0014-World-Instance-flag.patch
+++ b/patches/server/0014-World-Instance-flag.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] World Instance flag
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 768017ba650f1bd96e3db0aad8fda939e2ea7add..be0799e899c0992641769452a1fcc2b49d15c923 100644
+index b5b56d4549e97abbbe9e91d881b9bca8428f1eec..b884688d0fb3e46e04a4546c202476df6f94f59b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -211,6 +211,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -212,6 +212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public final UUID uuid;
      public boolean hasPhysicsEvent = true; // Paper
      public boolean hasEntityMoveEvent = false; // Paper
@@ -17,10 +17,10 @@ index 768017ba650f1bd96e3db0aad8fda939e2ea7add..be0799e899c0992641769452a1fcc2b4
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2c3ce2065812de227c34506edddb439da9a07ba1..eebdeb114fbc2f11706c0a4f90a6f8ea9e644dd5 100644
+index b2c5fbfcb64f3056d7975db43b2db45bfd5e9890..0bed6e05db5c6170161158fdd520042179491c6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1265,6 +1265,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1268,6 +1268,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          world.noSave = !value;
      }
  
diff --git a/patches/server/0016-Add-player-data-saving-events.patch b/patches/server/0016-Add-player-data-saving-events.patch
index ec55e3aa3..cc976dd7d 100644
--- a/patches/server/0016-Add-player-data-saving-events.patch
+++ b/patches/server/0016-Add-player-data-saving-events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player data saving events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 170f58e56c6a6cae26f7c9e55c74c3c3074500da..754ac18682a9d693c2b282e7f015926a94c4ca15 100644
+index aa9c5c26b69db883ff933d35d0c99425e95ad455..b8a453b6abfa6f10c36757a2759e8f0d99473483 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -606,6 +606,8 @@ public class ServerPlayerGameMode {
+@@ -616,6 +616,8 @@ public class ServerPlayerGameMode {
                      enuminteractionresult1 = stack.useOn(itemactioncontext, hand);
                  }
  
@@ -18,7 +18,7 @@ index 170f58e56c6a6cae26f7c9e55c74c3c3074500da..754ac18682a9d693c2b282e7f015926a
                      CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(player, blockposition, itemstack1);
                  }
 diff --git a/src/main/java/net/minecraft/stats/ServerStatsCounter.java b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
-index ee5bb1a8edb812d48d5af45ea8485f574dcb2ad5..94317f2dcf997fbe4707fc3e2d231176d55992ec 100644
+index c59f98ca3adfdd90cdc5999aeadbb0834efedc0f..6e819bd376eb9edee6bf8bd8c08a755599f1514a 100644
 --- a/src/main/java/net/minecraft/stats/ServerStatsCounter.java
 +++ b/src/main/java/net/minecraft/stats/ServerStatsCounter.java
 @@ -201,7 +201,12 @@ public class ServerStatsCounter extends StatsCounter {
@@ -45,7 +45,7 @@ index ee5bb1a8edb812d48d5af45ea8485f574dcb2ad5..94317f2dcf997fbe4707fc3e2d231176
  
      private static <T> ResourceLocation getKey(Stat<T> stat) {
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 35c39aed9583275ef25d32c783715798b52bdb63..258813e65b521dccb19f4f3248588a7106a1e24b 100644
+index 601f8099f74e81c17600566b3c9b7a6dd39c9bcb..cde84f45b67b88ecc410cdff924170b5b5366823 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 @@ -33,6 +33,7 @@ public class PlayerDataStorage {
diff --git a/patches/server/0017-Disable-geode-generation.patch b/patches/server/0017-Disable-geode-generation.patch
index 80e593719..9961b7b05 100644
--- a/patches/server/0017-Disable-geode-generation.patch
+++ b/patches/server/0017-Disable-geode-generation.patch
@@ -5,15 +5,17 @@ Subject: [PATCH] Disable geode generation
 
 
 diff --git a/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java b/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java
-index 7cf6d6a055f40fd9e05aadc680ce6f703b808653..9dc539688a84ae716cb91e362692c651918391d1 100644
+index 7cf6d6a055f40fd9e05aadc680ce6f703b808653..317bf4d6557426dc3bc1485db6969d74544d73eb 100644
 --- a/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java
 +++ b/src/main/java/net/minecraft/data/worldgen/biome/OverworldBiomes.java
-@@ -41,7 +41,7 @@ public class OverworldBiomes {
+@@ -41,8 +41,8 @@ public class OverworldBiomes {
  
      private static void globalOverworldGeneration(BiomeGenerationSettings.Builder generationSettings) {
          BiomeDefaultFeatures.addDefaultCarversAndLakes(generationSettings);
 -        BiomeDefaultFeatures.addDefaultCrystalFormations(generationSettings);
+-        BiomeDefaultFeatures.addDefaultMonsterRoom(generationSettings);
 +//        BiomeDefaultFeatures.addDefaultCrystalFormations(generationSettings); // Slice - Don't generate Geodes in our chunk generation
-         BiomeDefaultFeatures.addDefaultMonsterRoom(generationSettings);
++//        BiomeDefaultFeatures.addDefaultMonsterRoom(generationSettings);
          BiomeDefaultFeatures.addDefaultUndergroundVariety(generationSettings);
          BiomeDefaultFeatures.addDefaultSprings(generationSettings);
+         BiomeDefaultFeatures.addSurfaceFreezing(generationSettings);