diff --git a/build-data/reobf-mappings-patch.tiny b/build-data/reobf-mappings-patch.tiny
index 355733ef7e..ff20e13a65 100644
--- a/build-data/reobf-mappings-patch.tiny
+++ b/build-data/reobf-mappings-patch.tiny
@@ -19,28 +19,6 @@ c	net/minecraft/server/level/ServerLevel	net/minecraft/server/level/WorldServer
 c	net/minecraft/world/level/chunk/LevelChunk	net/minecraft/world/level/chunk/Chunk
 	f	Lnet/minecraft/server/level/ServerLevel;	level	i
 
-# unknown issue
-c	net/minecraft/core/RegistryAccess	net/minecraft/core/IRegistryCustom
-	m	(Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/Registry;	registryOrThrow	d
-
-c	net/minecraft/server/ServerResources	net/minecraft/server/DataPackResources
-	m	()Lnet/minecraft/server/packs/resources/ResourceManager;	getResourceManager	i
-
-c	net/minecraft/server/MinecraftServer	net/minecraft/server/MinecraftServer
-	m	()Lnet/minecraft/world/level/storage/WorldData;	getWorldData	getSaveData
-
-c	net/minecraft/server/MinecraftServer	net/minecraft/server/MinecraftServer
-	m	()Lnet/minecraft/world/level/storage/loot/LootTables;	getLootTables	getLootTableRegistry
-
-c	net/minecraft/world/effect/MobEffect	net/minecraft/world/effect/MobEffectList
-	m	(I)Lnet/minecraft/world/effect/MobEffect;	byId	fromId
-
-c	net/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess	net/minecraft/world/level/storage/Convertable$ConversionSession
-	m	(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/world/level/DataPackConfig;)Lnet/minecraft/world/level/storage/WorldData;	getDataTag	a
-
-c	net/minecraft/commands/arguments/MobEffectArgument	net/minecraft/commands/arguments/ArgumentMobEffect
-	m	(Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet.minecraft.world.effect/MobEffect;	getEffect	a
-
 # Paper moves method up from ServerLevel to Level
 c	net/minecraft/world/level/Level	net/minecraft/world/level/World
 	m	()Lnet/minecraft/core/BlockPos;	getSharedSpawnPos	getSpawn
diff --git a/build.gradle.kts b/build.gradle.kts
index 7331f7e2f6..0bcc5758b4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "7.1.0" apply false
-    id("io.papermc.paperweight.core") version "1.1.12"
+    id("io.papermc.paperweight.core") version "1.1.13"
 }
 
 allprojects {
diff --git a/patches/server/Async-catch-modifications-to-critical-entity-state.patch b/patches/server/Async-catch-modifications-to-critical-entity-state.patch
index 7af0b6267f..c797fcae73 100644
--- a/patches/server/Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/Async-catch-modifications-to-critical-entity-state.patch
@@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      private boolean addEntityUuid(T entity) {
-+        org.spigotmc.AsyncCatcher.catchOp("Enity add by UUID"); // Paper
++        org.spigotmc.AsyncCatcher.catchOp("Entity add by UUID"); // Paper
          if (!this.knownUuids.add(entity.getUUID())) {
              // Paper start
              T conflict = this.visibleEntityStorage.getEntity(entity.getUUID());
@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      private boolean addEntity(T entity, boolean existing) {
-+        org.spigotmc.AsyncCatcher.catchOp("Enity add"); // Paper
++        org.spigotmc.AsyncCatcher.catchOp("Entity add"); // Paper
          if (!this.addEntityUuid(entity)) {
              return false;
          } else {
@@ -31,23 +31,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      void startTicking(T entity) {
-+        org.spigotmc.AsyncCatcher.catchOp("Enity start ticking"); // Paper
++        org.spigotmc.AsyncCatcher.catchOp("Entity start ticking"); // Paper
          this.callbacks.onTickingStart(entity);
      }
  
      void stopTicking(T entity) {
-+        org.spigotmc.AsyncCatcher.catchOp("Enity stop ticking"); // Paper
++        org.spigotmc.AsyncCatcher.catchOp("Entity stop ticking"); // Paper
          this.callbacks.onTickingEnd(entity);
      }
  
      void startTracking(T entity) {
-+        org.spigotmc.AsyncCatcher.catchOp("Enity start tracking"); // Paper
++        org.spigotmc.AsyncCatcher.catchOp("Entity start tracking"); // Paper
          this.visibleEntityStorage.add(entity);
          this.callbacks.onTrackingStart(entity);
      }
  
      void stopTracking(T entity) {
-+        org.spigotmc.AsyncCatcher.catchOp("Enity stop tracking"); // Paper
++        org.spigotmc.AsyncCatcher.catchOp("Entity stop tracking"); // Paper
          this.callbacks.onTrackingEnd(entity);
          this.visibleEntityStorage.remove(entity);
      }
diff --git a/patches/server/EntityPathfindEvent.patch b/patches/server/EntityPathfindEvent.patch
index a0c4c849ea..5d211ade9f 100644
--- a/patches/server/EntityPathfindEvent.patch
+++ b/patches/server/EntityPathfindEvent.patch
@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public Path createPath(Entity entity, int distance) {
 -        return this.createPath(entity.blockPosition(), distance);
-+        return this.a(entity.blockPosition(), entity, distance); // Paper - Forward target entity
++        return this.createPath(entity.blockPosition(), entity, distance); // Paper - Forward target entity
      }
  
      @Override
@@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public Path createPath(Entity entity, int distance) {
 -        return this.createPath(entity.blockPosition(), distance);
-+        return this.a(entity.blockPosition(), entity, distance); // Paper - Forward target entity
++        return this.createPath(entity.blockPosition(), entity, distance); // Paper - Forward target entity
      }
  
      private int getSurfaceY() {
@@ -48,11 +48,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Nullable
      public Path createPath(BlockPos target, int distance) {
 -        return this.createPath(ImmutableSet.of(target), 8, false, distance);
-+        // Paper start - add target parameter
-+        return this.a(target, null, distance);
++        // Paper start - add target entity parameter
++        return this.createPath(target, null, distance);
 +    }
-+    @Nullable public Path a(BlockPos blockposition, Entity target, int distance) {
-+        return this.createPath(ImmutableSet.of(blockposition), target, 8, false, distance);
++    @Nullable
++    public Path createPath(BlockPos target, Entity entity, int distance) {
++        return this.createPath(ImmutableSet.of(target), entity, 8, false, distance);
 +        // Paper end
      }