diff --git a/patches/server-remapped/0329-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 64%
rename from patches/server-remapped/0329-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index e847f69596..4ca9291478 100644
--- a/patches/server-remapped/0329-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/server/0305-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -7,23 +7,21 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 0b26d3ab2db66d6baaa95d1d5f6c756595d31495..8d619e0bf8bcf7d6d4e7f23f11d648ccfb65cac4 100644
+index 589fbdd5c86655244aa92a42e5f45747b5c5026e..bc0e5df6c7e4a5784c3194c716dd2bb033aea9e5 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -31,6 +31,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
-     private final FormattedCharSequence[] renderMessages;
-     private DyeColor color;
-     public java.util.UUID signEditor; // Paper
+@@ -1,4 +1,5 @@
+ package net.minecraft.world.level.block.entity;
 +    private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns"); // Paper
  
-     public SignBlockEntity() {
-         super(BlockEntityType.SIGN);
-@@ -51,7 +52,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
+ import java.util.UUID;
+@@ -66,7 +67,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
          }
  
          // CraftBukkit start
 -        if (Boolean.getBoolean("convertLegacySigns")) {
 +        if (CONVERT_LEGACY_SIGNS) { // Paper
-             tag.putBoolean("Bukkit.isConverted", true);
+             nbt.putBoolean("Bukkit.isConverted", true);
          }
          // CraftBukkit end