diff --git a/Spigot-Server-Patches/MC-Dev-fixes.patch b/Spigot-Server-Patches/MC-Dev-fixes.patch
index 798c3c42ed..dc44779c53 100644
--- a/Spigot-Server-Patches/MC-Dev-fixes.patch
+++ b/Spigot-Server-Patches/MC-Dev-fixes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index e8f7b729..a0ebc1ea 100644
+index e8f7b7292..a0ebc1eaa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -0,0 +0,0 @@ public class PaperCommand extends Command {
@@ -15,7 +15,7 @@ index e8f7b729..a0ebc1ea 100644
 +    
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 002da2a1..121a137f 100644
+index 002da2a19..9f3aa2459 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@@ -56,8 +56,20 @@ index 002da2a1..121a137f 100644
                              ++this.j;
                          }
  
+@@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
+                         if (this.g.b < l) {
+                             ++this.g.b;
+                         } else if (this.g.c < i1) {
++                            this.g.b = i; // Paper - Readd line removed by the decompiler
+                             ++this.g.c;
+                         } else if (this.g.d < j1) {
++                            this.g.b = i; // Paper - Readd line removed by the decompiler
++                            this.g.c = j; // Paper - Readd line removed by the decompiler
+                             ++this.g.d;
+                         }
+ 
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index a661789c..785a1a21 100644
+index a661789c1..785a1a218 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -0,0 +0,0 @@ public class DefinedStructure {
@@ -112,7 +124,7 @@ index a661789c..785a1a21 100644
  
          public Iterator<IBlockData> iterator() {
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index 3b8f6ec1..bde5714d 100644
+index 3b8f6ec16..bde5714dd 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -0,0 +0,0 @@ import java.util.Arrays;
@@ -152,6 +164,4 @@ index 3b8f6ec1..bde5714d 100644
          this.e = 0;
          this.f = 0;
  
--- 
-2.17.0 (Apple Git-106)
-
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/MC-Utils.patch b/Spigot-Server-Patches/MC-Utils.patch
index eb6ee73dda..eaba31a37a 100644
--- a/Spigot-Server-Patches/MC-Utils.patch
+++ b/Spigot-Server-Patches/MC-Utils.patch
@@ -18,7 +18,7 @@ index c3e990bdf..e2a7b4be2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 121a137f3..279045e49 100644
+index 9f3aa2459..7dbea9090 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 402f25aee5..76df830f37 100644
--- a/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -31,7 +31,7 @@ index e2a7b4be2..58f8b4b72 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 279045e49..7122a9aa8 100644
+index 7dbea9090..252e00e16 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
diff --git a/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
index 6be8342b29..bf494c164f 100644
--- a/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 58f8b4b720..98992513da 100644
+index 58f8b4b72..98992513d 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -0,0 +0,0 @@ import javax.annotation.concurrent.Immutable;
@@ -80,7 +80,7 @@ index 58f8b4b720..98992513da 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 7122a9aa8a..2f6fc330b3 100644
+index 252e00e16..f769b178c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@@ -94,15 +94,21 @@ index 7122a9aa8a..2f6fc330b3 100644
 -                        if (this.g.b < l) {
 -                            ++this.g.b;
 -                        } else if (this.g.c < i1) {
+-                            this.g.b = i; // Paper - Readd line removed by the decompiler
 -                            ++this.g.c;
 -                        } else if (this.g.d < j1) {
+-                            this.g.b = i; // Paper - Readd line removed by the decompiler
+-                            this.g.c = j; // Paper - Readd line removed by the decompiler
 -                            ++this.g.d;
 +                        // Paper start - use xyz
 +                        if (this.g.x < l) {
 +                            ++this.g.x;
 +                        } else if (this.g.y < i1) {
++                            this.g.x = i; // Paper - Readd line removed by the decompiler
 +                            ++this.g.y;
 +                        } else if (this.g.z < j1) {
++                            this.g.x = i; // Paper - Readd line removed by the decompiler
++                            this.g.y = j; // Paper - Readd line removed by the decompiler
 +                            ++this.g.z;
 +                            // Paper end
                          }