aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2023-10-05 16:03:26 +1000
committerNassim Jahnke <[email protected]>2023-10-05 16:03:26 +1000
commitcfe311d7a51eeb9e14c526f57efab9837f30c5d0 (patch)
tree52241d8bc9aeff5375efee0aabed1730ce46b63b
parent431e6418ab33ff0decd16f82238e9d50daf328f5 (diff)
downloadPaper-cfe311d7a51eeb9e14c526f57efab9837f30c5d0.tar.gz
Paper-cfe311d7a51eeb9e14c526f57efab9837f30c5d0.zip
Fix item effects conversion if no tag is present
Fixes #9796
-rw-r--r--patches/server/0015-Rewrite-dataconverter-system.patch8
1 files changed, 6 insertions, 2 deletions
diff --git a/patches/server/0015-Rewrite-dataconverter-system.patch b/patches/server/0015-Rewrite-dataconverter-system.patch
index 4786abdf35..8a76ccb351 100644
--- a/patches/server/0015-Rewrite-dataconverter-system.patch
+++ b/patches/server/0015-Rewrite-dataconverter-system.patch
@@ -19145,10 +19145,10 @@ index 0000000000000000000000000000000000000000..2501759bc1c0313c0556d4f75a0c4a3d
+}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java
new file mode 100644
-index 0000000000000000000000000000000000000000..98272d556a09e9f035005c6783ebb229c2c7157d
+index 0000000000000000000000000000000000000000..311a57529c5f95ce48631b48fefb4ebae401b3f7
--- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3568.java
-@@ -0,0 +1,239 @@
+@@ -0,0 +1,243 @@
+package ca.spottedleaf.dataconverter.minecraft.versions;
+
+import ca.spottedleaf.dataconverter.converters.DataConverter;
@@ -19352,6 +19352,10 @@ index 0000000000000000000000000000000000000000..98272d556a09e9f035005c6783ebb229
+
+ final MapType<String> tag = root.getMap("tag");
+
++ if (tag == null) {
++ return null;
++ }
++
+ if ("minecraft:suspicious_stew".equals(id)) {
+ RenameHelper.renameSingle(tag, "Effects", "effects");
+