aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0989-Rewrite-dataconverter-system.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-07-18 16:50:16 +0200
committerNassim Jahnke <[email protected]>2024-07-18 18:15:13 +0200
commita8db5274493f3bf6c91c8bc9d4a3618a02ba5500 (patch)
tree117f005d0e84f51bcdaeedf55bf7fd6cb3766932 /patches/server/0989-Rewrite-dataconverter-system.patch
parent3c8a7fe1a4a7e348106795ca44529ff6d2005234 (diff)
downloadPaper-a8db5274493f3bf6c91c8bc9d4a3618a02ba5500.tar.gz
Paper-a8db5274493f3bf6c91c8bc9d4a3618a02ba5500.zip
Even more cleanup of mcutil patch
Diffstat (limited to 'patches/server/0989-Rewrite-dataconverter-system.patch')
-rw-r--r--patches/server/0989-Rewrite-dataconverter-system.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0989-Rewrite-dataconverter-system.patch b/patches/server/0989-Rewrite-dataconverter-system.patch
index ea19e60350..fcdd549d37 100644
--- a/patches/server/0989-Rewrite-dataconverter-system.patch
+++ b/patches/server/0989-Rewrite-dataconverter-system.patch
@@ -29388,10 +29388,10 @@ index 1d287dd7379e56f7fd4b425880b850cd843f5789..8ab7ca373a885fbe658013c9c6a2e38d
return nbttagcompound;
});
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index fa60f4e05e3303a7fe4faab0098c1fb439a24354..ca1c0955be0d0f78972f39c4bd4afffd46c2fb45 100644
+index 9fbe938e7c1efdc256aa5303651a7f14e972e559..ff60dc1eae8d3c13006b5f19e5bb64c8309fd3d3 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -516,7 +516,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -499,7 +499,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data);
final int dataVersion = compound.getInt("DataVersion");
@@ -29400,7 +29400,7 @@ index fa60f4e05e3303a7fe4faab0098c1fb439a24354..ca1c0955be0d0f78972f39c4bd4afffd
return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.parse(MinecraftServer.getServer().registryAccess(), compound).orElseThrow());
}
-@@ -537,7 +537,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -520,7 +520,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
net.minecraft.nbt.CompoundTag compound = deserializeNbtFromBytes(data);
int dataVersion = compound.getInt("DataVersion");