diff --git a/gradle.properties b/gradle.properties
index 4e1701b21..ba7a3b9b7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
 mcVersion = 1.18.1
 packageVersion = 1_18_R1
 
-paperCommit = 22be4d5c603f4046e2e6bea3fd7e139e3085b7b4
+paperCommit = 1931bb53bfdb7395f8214c9a7b6d4d65046efdee
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch
index ab08b385f..e8c8c0db7 100644
--- a/patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch
+++ b/patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch
@@ -684,7 +684,7 @@ index 248cd6faa72a91ceaf6f74d06c05d05bd26f5fbc..6ec728854333cd473528162b6381e7a5
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f093f991f1fedd20fcef041b093398250b7fb286..49d8b1bdad79f452c863f83557ffde7e8f4749c6 100644
+index 77f52b117dec8b99a507995a587505229eadb89e..ba8c55f9ad20049d950813cc971c18aa9a33c172 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -59,7 +59,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@@ -705,7 +705,7 @@ index f093f991f1fedd20fcef041b093398250b7fb286..49d8b1bdad79f452c863f83557ffde7e
      void setDisplayName(@Nullable String name);
  
      // Paper start
-@@ -155,7 +155,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -161,7 +161,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * @return a list of lore that is set
       * @deprecated in favour of {@link #lore()}
       */
@@ -714,7 +714,7 @@ index f093f991f1fedd20fcef041b093398250b7fb286..49d8b1bdad79f452c863f83557ffde7e
      @Nullable
      List<String> getLore();
  
-@@ -179,7 +179,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -185,7 +185,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
       * @param lore the lore that will be set
       * @deprecated in favour of {@link #lore(List)}
       */
diff --git a/patches/server/0249-Option-to-prevent-spiders-from-climbing-world-border.patch b/patches/server/0248-Option-to-prevent-spiders-from-climbing-world-border.patch
similarity index 100%
rename from patches/server/0249-Option-to-prevent-spiders-from-climbing-world-border.patch
rename to patches/server/0248-Option-to-prevent-spiders-from-climbing-world-border.patch
diff --git a/patches/server/0248-PaperPR-Fix-Chunk-isSlimeChunk-when-all-chunks-are-s.patch b/patches/server/0248-PaperPR-Fix-Chunk-isSlimeChunk-when-all-chunks-are-s.patch
deleted file mode 100644
index e99269083..000000000
--- a/patches/server/0248-PaperPR-Fix-Chunk-isSlimeChunk-when-all-chunks-are-s.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <blake.galbreath@gmail.com>
-Date: Mon, 27 Dec 2021 12:25:14 -0600
-Subject: [PATCH] PaperPR - Fix Chunk#isSlimeChunk when
- all-chunks-are-slime-chunks is true
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index d51476ca2aad08a0dd93a2e772dd7750afc939dc..f20293426b104ed0c02a931b5ab77f87590f0c18 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -205,7 +205,7 @@ public class CraftChunk implements Chunk {
-     @Override
-     public boolean isSlimeChunk() {
-         // 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk
--        return WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), worldServer.spigotConfig.slimeSeed).nextInt(10) == 0;
-+        return this.worldServer.paperConfig.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), worldServer.spigotConfig.slimeSeed).nextInt(10) == 0; // Paper
-     }
- 
-     @Override