diff --git a/gradle.properties b/gradle.properties
index 9d434c5..965b079 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = gg.projecteden.parchment
 version = 1.18.1-R0.1-SNAPSHOT
 
 mcVersion = 1.18.1
-paperRef = a8f2d6749189f58b131fb077b7961b31df5f8005
+paperRef = 30cb7d0407bfb01a3bc0cc2da1dc0af32dfae5a4
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/api/0008-Expose-MCUtil-Executors.patch b/patches/api/0008-Expose-MCUtil-Executors.patch
index 2ca8ed2..193cb1f 100644
--- a/patches/api/0008-Expose-MCUtil-Executors.patch
+++ b/patches/api/0008-Expose-MCUtil-Executors.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Expose MCUtil Executors
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a62c27777672eff1c488517b37876e3a44a2d57d..6d0e9ac4b48c81c9bbf1b0cfee9aac2bc70ba48d 100644
+index cca362e54d6ff4a5a1e60f85a7eb1b3d222d3d48..e9ee90ce4f1c8b58ab2b20a6806de11dcdf98423 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1996,4 +1996,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     @NotNull
-     io.papermc.paper.datapack.DatapackManager getDatapackManager();
+@@ -2003,4 +2003,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+      */
+     @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
 +
 +    // Parchment start
diff --git a/patches/api/0010-Add-Furnace-Recipe-API.patch b/patches/api/0010-Add-Furnace-Recipe-API.patch
index b64ffcf..948cf68 100644
--- a/patches/api/0010-Add-Furnace-Recipe-API.patch
+++ b/patches/api/0010-Add-Furnace-Recipe-API.patch
@@ -64,10 +64,10 @@ index 0000000000000000000000000000000000000000..28c01caa9d6379046f6af6612719b404
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 959ee46cd440af5a4e5db3f6ee8b163db8e40d86..756bc14add024e74ca27dd12240e920610e7d74d 100644
+index 8a688583e65cd22e0417f9fd24e51803486d095e..b69e0ab985613eede661153e331f1172676212d9 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3918,6 +3918,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3929,6 +3929,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
index 094fe41..f64e2a5 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 028f6a1795ceb99d1760c73b0980238677b4b8bc..0466c22ca2325d090a5763c6b940252c32815a85 100644
+index 4662952bd0a389fe77e00ede9ab4a57f33522794..39a1d297feef86c9427a605b1ff2b7fa3fae370e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -18,8 +18,8 @@ repositories {
@@ -104,10 +104,10 @@ index ece77f5ea4b14bbed7c070131b3251ea86764538..71bf426f7fb58fff6739bb1332d1286d
                  org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eab93e1e3712c0a01cac187bf5944818c813d665..b0cf1f901fc0798e858be395ef349a42a7b3954a 100644
+index c847a2b935130a293d9ac4c196c9cff27470649b..b624314d1c21be56b85764eb3fe3c76db63f7589 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1709,7 +1709,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1719,7 +1719,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -117,7 +117,7 @@ index eab93e1e3712c0a01cac187bf5944818c813d665..b0cf1f901fc0798e858be395ef349a42
  
      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 f0629cac377b29246e990a01d60601270cbd77bd..ba750e735bb856532a74dde2ef7dba32d4c970d1 100644
+index 51f67a2944034552d57b939ef29e0249e74383b9..bb3c7383d774dec2951cf29ea516d242de25a15f 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
diff --git a/patches/server/0003-Add-SoundEvent.patch b/patches/server/0003-Add-SoundEvent.patch
index fcc9c27..1d0fb77 100644
--- a/patches/server/0003-Add-SoundEvent.patch
+++ b/patches/server/0003-Add-SoundEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add SoundEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a2abb8aa1a257ccd2b5dbddc037fffc6eb600758..c27a253179d49956ebdd9d7b7b294a13690e4ca7 100644
+index 768017ba650f1bd96e3db0aad8fda939e2ea7add..47ccd16dd86072805359266b746ff9a70e4513ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1504,12 +1504,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1509,12 +1509,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void playSound(@Nullable Player except, double x, double y, double z, SoundEvent sound, SoundSource category, float volume, float pitch) {
@@ -24,7 +24,7 @@ index a2abb8aa1a257ccd2b5dbddc037fffc6eb600758..c27a253179d49956ebdd9d7b7b294a13
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7b23535a680d2a8534dcb8dd87770f66fb982c13..d522d26b388dbd3b61ca82e5d5ea83f5e1fb89eb 100644
+index 470dbed47830e2f580c090bc762a7be5cf389ce5..c0ec32d2575bd9bfcea81ec60af22bb341b7802b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2189,7 +2189,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 7b23535a680d2a8534dcb8dd87770f66fb982c13..d522d26b388dbd3b61ca82e5d5ea83f5
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cd08f9b16c065be8f0eacaeba51d3e72d332daf9..02f373ecd9e4da1115da9c650b91893be9d0faf5 100644
+index 7a0c1ba40156df69bbbf36d96bed0950130d2351..7d535b82ccfd3d5269ecaeb35a8cb9ac7d18a69a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -967,7 +967,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0009-Expose-MCUtil-Executors.patch b/patches/server/0009-Expose-MCUtil-Executors.patch
index 8255a74..13ad177 100644
--- a/patches/server/0009-Expose-MCUtil-Executors.patch
+++ b/patches/server/0009-Expose-MCUtil-Executors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ba750e735bb856532a74dde2ef7dba32d4c970d1..347874e04f7b6f04115dec5a398a073bacbf656d 100644
+index bb3c7383d774dec2951cf29ea516d242de25a15f..7ae15e38d65a6f122d6a710f91ed3cbe9322dd47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2837,4 +2837,16 @@ public final class CraftServer implements Server {
+@@ -2857,4 +2857,16 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch b/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch
index 764c09b..3ff796b 100644
--- a/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch
+++ b/patches/server/0010-Fix-missing-CraftMetaSkull-serializedProfile.patch
@@ -6,17 +6,10 @@ Subject: [PATCH] Fix missing CraftMetaSkull serializedProfile
 Plugins (ab)using NMS may change the "profile" field using reflections instead of the "setProfile" method, especially if they are targeted towards old Minecraft versions. This fixes the potential discrepancies and NPEs.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 9f72e1623fc85301c4ca8751a7e03877a7745948..4b5fdb42a72f0730553e5c5ff2819a6798a99ed8 100644
+index 292ae4a68093b7d939a755e1062cee57da186ab1..4afa90cb68aa31820abce6ab051de405daef6562 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-@@ -83,12 +83,18 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
-     @Override
-     void serializeInternal(final Map<String, Tag> internalTags) {
-         if (this.profile != null) {
-+            refreshSerializedProfile(); // Parchment -- fix NPEs from plugins abusing NMS
-             internalTags.put(SKULL_PROFILE.NBT, serializedProfile);
-         }
-     }
+@@ -80,6 +80,11 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
  
      private void setProfile(GameProfile profile) {
          this.profile = profile;
@@ -28,7 +21,7 @@ index 9f72e1623fc85301c4ca8751a7e03877a7745948..4b5fdb42a72f0730553e5c5ff2819a67
          this.serializedProfile = (profile == null) ? null : NbtUtils.writeGameProfile(new CompoundTag(), profile);
      }
  
-@@ -97,6 +103,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -88,6 +93,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          super.applyToItem(tag);
  
          if (this.profile != null) {
@@ -36,7 +29,7 @@ index 9f72e1623fc85301c4ca8751a7e03877a7745948..4b5fdb42a72f0730553e5c5ff2819a67
              // SPIGOT-6558: Set initial textures
              tag.put(SKULL_OWNER.NBT, serializedProfile);
              // Fill in textures
-@@ -252,6 +259,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -243,6 +249,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          if (meta instanceof CraftMetaSkull) {
              CraftMetaSkull that = (CraftMetaSkull) meta;
  
diff --git a/patches/server/0012-Add-Furnace-Recipe-API.patch b/patches/server/0012-Add-Furnace-Recipe-API.patch
index 8b19296..1e3c915 100644
--- a/patches/server/0012-Add-Furnace-Recipe-API.patch
+++ b/patches/server/0012-Add-Furnace-Recipe-API.patch
@@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..e7114e456f818d7bdd4081620f4b9b93
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 72f395c8d88c7dd77f39c7ae29dbfcaa683ecc0a..d4f603904544b7f0e37df1cb66b6cc922ea7ef84 100644
+index 2c3ce2065812de227c34506edddb439da9a07ba1..e238c3ac4948081bc28d03d45f6f1e2b097f0f97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2270,4 +2270,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2312,4 +2312,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return this.adventure$pointers;
      }
      // Paper end
diff --git a/patches/server/0013-Disable-sleep-status-announcements.patch b/patches/server/0013-Disable-sleep-status-announcements.patch
index 2be722e..42b9eab 100644
--- a/patches/server/0013-Disable-sleep-status-announcements.patch
+++ b/patches/server/0013-Disable-sleep-status-announcements.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable sleep status announcements
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 205b2a1c7db64cb0b23289e11d8b551a78fca5be..51af3b5b730a427743fb4f93c0e7fef7a10454ac 100644
+index 47ccd16dd86072805359266b746ff9a70e4513ad..2135c3e9df70c9c3e492e63f9c348510f488b121 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -893,7 +893,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -896,7 +896,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      private void announceSleepStatus() {