From fe0f3dd21091978ed5c29ecf9966819b3f05b886 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 20 Dec 2023 16:36:07 +0100 Subject: [PATCH] [Fixed] Crash when placing an eternal Crystal with no portal blocks in range (#323) --- .../betterend/blocks/entities/EternalPedestalEntity.java | 5 ++++- .../java/org/betterx/betterend/rituals/EternalRitual.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/betterx/betterend/blocks/entities/EternalPedestalEntity.java b/src/main/java/org/betterx/betterend/blocks/entities/EternalPedestalEntity.java index 9dd3bbc9..829f41d7 100644 --- a/src/main/java/org/betterx/betterend/blocks/entities/EternalPedestalEntity.java +++ b/src/main/java/org/betterx/betterend/blocks/entities/EternalPedestalEntity.java @@ -38,7 +38,10 @@ public class EternalPedestalEntity extends PedestalBlockEntity { @Override public void saveAdditional(CompoundTag tag) { if (hasRitual()) { - tag.put("ritual", linkedRitual.toTag(new CompoundTag())); + final CompoundTag ritualTag = linkedRitual.toTag(new CompoundTag()); + if (ritualTag != null) { + tag.put("ritual", ritualTag); + } } super.saveAdditional(tag); } diff --git a/src/main/java/org/betterx/betterend/rituals/EternalRitual.java b/src/main/java/org/betterx/betterend/rituals/EternalRitual.java index a817c045..430d7454 100644 --- a/src/main/java/org/betterx/betterend/rituals/EternalRitual.java +++ b/src/main/java/org/betterx/betterend/rituals/EternalRitual.java @@ -488,6 +488,7 @@ public class EternalRitual { } public CompoundTag toTag(CompoundTag tag) { + if (this.center == null || this.axis == null || this.exit == null) return null; tag.put("center", NbtUtils.writeBlockPos(center)); tag.putString("axis", axis.getName()); tag.putBoolean("active", active);