Skip to content

Commit a891868

Browse files
committed
Fix ISerializer#fromNBT crashing on null NBT tags.
1 parent 818bfef commit a891868

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Common/src/main/java/net/darkhax/bookshelf/api/serialization/ISerializer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraft.nbt.Tag;
1010
import net.minecraft.network.FriendlyByteBuf;
1111

12+
import javax.annotation.Nullable;
1213
import java.util.ArrayList;
1314
import java.util.HashSet;
1415
import java.util.List;
@@ -125,9 +126,9 @@ default T fromNBT(CompoundTag tag, String name) {
125126
throw new NBTParseException("Required tag " + name + " was not present.");
126127
}
127128

128-
default T fromNBT(CompoundTag tag, String name, T fallback) {
129+
default T fromNBT(@Nullable CompoundTag tag, String name, T fallback) {
129130

130-
return tag.contains(name) ? this.fromNBT(tag.get(name)) : fallback;
131+
return tag != null && tag.contains(name) ? this.fromNBT(tag.get(name)) : fallback;
131132
}
132133

133134
default void toNBT(CompoundTag tag, String name, T toWrite) {

0 commit comments

Comments
 (0)