Fix NullPointerException on first deployer placed (Fabric/Forge) (#82)

* Fix NullPointerException thrown on first deployer placed * Fix deployer on Forge side as well
badasintended · Dec 18, 2024 · 25c0e7b · 25c0e7b
1 parent 022d738
commit 25c0e7b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/...s/fabric/create/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java b/...s/fabric/create/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java
@@ -11,8 +11,13 @@ public class DeployerProvider implements IDataProvider<DeployerBlockEntity> {
 
     @Override
     public void appendData(IDataWriter data, IServerAccessor<DeployerBlockEntity> accessor, IPluginConfig config) {
-        data.add(ItemData.class, res -> res.add(ItemData.of(config)
-            .add(accessor.getTarget().getPlayer().getMainHandItem())));
+        data.add(ItemData.class, res -> {
+            var fakePlayer = accessor.getTarget().getPlayer();
+            if (fakePlayer == null)
+                return;
+
+            res.add(ItemData.of(config).add(fakePlayer.getMainHandItem()));
+        });
     }
 
 }
diff --git a/...es/forge/create/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java b/...es/forge/create/src/main/java/lol/bai/megane/module/create/provider/DeployerProvider.java
@@ -11,8 +11,13 @@ public class DeployerProvider implements IDataProvider<DeployerBlockEntity> {
 
     @Override
     public void appendData(IDataWriter data, IServerAccessor<DeployerBlockEntity> accessor, IPluginConfig config) {
-        data.add(ItemData.class, res -> res.add(ItemData.of(config)
-            .add(accessor.getTarget().getPlayer().getMainHandItem())));
+        data.add(ItemData.class, res -> {
+            var fakePlayer = accessor.getTarget().getPlayer();
+            if (fakePlayer == null)
+                return;
+
+            res.add(ItemData.of(config).add(fakePlayer.getMainHandItem()));
+        });
     }
 
 }