diff --git a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
index 24b23bbe9..737c94a7f 100644
--- a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
+++ b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication">
-    <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/purpur-paperclip-1.20.4-R0.1-SNAPSHOT-reobf.jar" />
+    <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/purpur-paperclip-1.20.6-R0.1-SNAPSHOT-mojmap.jar" />
     <option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
     <option name="ALTERNATIVE_JRE_PATH" />
diff --git a/.idea/runConfigurations/Upstream_Paper__createReobfPaperclipJar_.xml b/.idea/runConfigurations/Upstream_Paper__createMojmapPaperclipJar_.xml
similarity index 82%
rename from .idea/runConfigurations/Upstream_Paper__createReobfPaperclipJar_.xml
rename to .idea/runConfigurations/Upstream_Paper__createMojmapPaperclipJar_.xml
index 8911b6115..4145189fc 100644
--- a/.idea/runConfigurations/Upstream_Paper__createReobfPaperclipJar_.xml
+++ b/.idea/runConfigurations/Upstream_Paper__createMojmapPaperclipJar_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Upstream Paper [createReobfPaperclipJar]" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Upstream Paper [createMojmapPaperclipJar]" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="createReobfPaperclipJar" />
+          <option value="createMojmapPaperclipJar" />
         </list>
       </option>
       <option name="vmOptions" />
@@ -23,4 +23,4 @@
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Upstream Paper [build]" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 8c05d797b..9b92dea84 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
-paperCommit = 812ccb96a480cc6518ba5ddde11e12c22691c061
+paperCommit = 937a67a65172aa7ed2efafd536bbf7cfab2e3489
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 44b00e49e..07e65c2f1 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -250,10 +250,10 @@ index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc1
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 573b93fc4e392456af2f2cf3900a9d7014f67a22..e3fb34549e2f74e1c00f616c5f0fb60948c42d11 100644
+index a1c9989df460d7ae3666fffe7968750832a30b85..ad7f21566271260270db452e2f15c32f8a829d28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -508,7 +508,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -507,7 +507,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {