From 73bb013b25f2114962f51058e842436b87a62bdd Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Fri, 22 Mar 2019 09:53:07 -0700 Subject: [PATCH] Fail fast when null is used with setTag instead of crashing in writeEntry (#5257) --- .../net/minecraft/nbt/NBTTagCompound.java.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch b/patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch index 9268737f2f..716d5080c1 100644 --- a/patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch +++ b/patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch @@ -1,6 +1,14 @@ --- a/net/minecraft/nbt/NBTTagCompound.java +++ b/net/minecraft/nbt/NBTTagCompound.java -@@ -389,6 +389,7 @@ +@@ -71,6 +71,7 @@ + } + + public void func_74782_a(String p_74782_1_, INBTBase p_74782_2_) { ++ if (p_74782_2_ == null) throw new IllegalArgumentException("Invalid null NBT value with key " + p_74782_1_); + this.field_74784_a.put(p_74782_1_, p_74782_2_); + } + +@@ -389,6 +390,7 @@ } private static byte func_152447_a(DataInput p_152447_0_, NBTSizeTracker p_152447_1_) throws IOException { @@ -8,7 +16,7 @@ return p_152447_0_.readByte(); } -@@ -397,6 +398,7 @@ +@@ -397,6 +399,7 @@ } static INBTBase func_152449_a(byte p_152449_0_, String p_152449_1_, DataInput p_152449_2_, int p_152449_3_, NBTSizeTracker p_152449_4_) throws IOException {