Fix NPE when placing a machine in-world automatically (#800)

AztechMC · Jul 24, 2024 · 00a87fc · 00a87fc
1 parent ac1ba8e
commit 00a87fc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/aztech/modern_industrialization/machines/MachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/MachineBlockEntity.java
@@ -199,7 +199,7 @@ public void openMenu(Player player) {
     protected abstract MachineModelClientData getModelData();
 
     @MustBeInvokedByOverriders
-    public void onPlaced(LivingEntity placer, ItemStack itemStack) {
+    public void onPlaced(@Nullable LivingEntity placer, ItemStack itemStack) {
         orientation.onPlaced(placer, itemStack);
         placedBy.onPlaced(placer);
     }

diff --git a/src/main/java/aztech/modern_industrialization/machines/components/OrientationComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/OrientationComponent.java
@@ -31,6 +31,7 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class OrientationComponent implements IComponent {
     public Direction facingDirection = Direction.NORTH;
@@ -92,8 +93,9 @@ public boolean useWrench(Player player, InteractionHand hand, Direction face) {
         return false;
     }
 
-    public void onPlaced(LivingEntity placer, ItemStack itemStack) {
-        Direction dir = placer.getDirection();
+    public void onPlaced(@Nullable LivingEntity placer, ItemStack itemStack) {
+        // The placer can be null using some mods' automatic placement: pick NORTH arbitrarily.
+        Direction dir = placer != null ? placer.getDirection() : Direction.NORTH;
         facingDirection = dir.getOpposite();
         if (params.hasOutput) {
             outputDirection = dir;

diff --git a/src/main/java/aztech/modern_industrialization/machines/components/PlacedByComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/PlacedByComponent.java
@@ -50,7 +50,7 @@ public void readNbt(CompoundTag tag) {
         }
     }
 
-    public void onPlaced(LivingEntity placer) {
+    public void onPlaced(@Nullable LivingEntity placer) {
         if (placer instanceof Player) {
             placerId = placer.getUUID();
         } else {

diff --git a/src/main/java/aztech/modern_industrialization/machines/multiblocks/HatchBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/multiblocks/HatchBlockEntity.java
@@ -40,6 +40,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class HatchBlockEntity extends MachineBlockEntity implements Tickable {
     public HatchBlockEntity(BEP bep, MachineGuiParameters guiParams, OrientationComponent.Params orientationParams) {
@@ -108,7 +109,7 @@ protected MachineModelClientData getModelData() {
     }
 
     @Override
-    public void onPlaced(LivingEntity placer, ItemStack itemStack) {
+    public void onPlaced(@Nullable LivingEntity placer, ItemStack itemStack) {
         super.onPlaced(placer, itemStack);
         if (orientation.params.hasOutput) {
             orientation.outputDirection = orientation.outputDirection.getOpposite();