From 122c9d3843e2ff0f90aae8fc1b16b41d8cc8fde8 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 15 Jun 2024 22:57:01 -0700
Subject: [PATCH] Fix NPE in V3808
The armor items may not exist, so we need to null check it.
---
patches/server/0971-Rewrite-dataconverter-system.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/patches/server/0971-Rewrite-dataconverter-system.patch b/patches/server/0971-Rewrite-dataconverter-system.patch
index 993066ea40..4fb37d7a6f 100644
--- a/patches/server/0971-Rewrite-dataconverter-system.patch
+++ b/patches/server/0971-Rewrite-dataconverter-system.patch
@@ -22083,7 +22083,7 @@ index 0000000000000000000000000000000000000000..a76916cdb7cf91b8ba5461524472b3e4
+}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java
new file mode 100644
-index 0000000000000000000000000000000000000000..22b7bf301c8ab7cde285fa257f240986a697b83f
+index 0000000000000000000000000000000000000000..78a10f89218eb0edf121f88978b4fe13e1b1bf44
--- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3808.java
@@ -0,0 +1,82 @@
@@ -22133,12 +22133,12 @@ index 0000000000000000000000000000000000000000..22b7bf301c8ab7cde285fa257f240986
+
+ if (this.clearArmor) {
+ final ListType armor = data.getList("ArmorItems", ObjectType.MAP);
-+ if (armor.size() > 2) {
++ if (armor != null && armor.size() > 2) {
+ armor.setMap(2, data.getTypeUtil().createEmptyMap());
+ }
+
+ final ListType chances = data.getList("ArmorDropChances", ObjectType.FLOAT);
-+ if (chances.size() > 2) {
++ if (chances != null && chances.size() > 2) {
+ chances.setFloat(2, 0.085F);
+ }
+ }