Fix potential NPE from null EntityPlayer passed through CraftingInfo

CleanroomMC · Dec 13, 2023 · ff44b08 · ff44b08
1 parent 0bdccde
commit ff44b08
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingInfo.java b/src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingInfo.java
@@ -14,7 +14,7 @@ public class CraftingInfo {
     public CraftingInfo(InventoryCrafting inventory, @UnknownNullability EntityPlayer player) {
         this.inventory = inventory;
         this.player = player;
-        this.world = player.world;
+        this.world = player == null ? null : player.world;
     }
 
     public InventoryCrafting getInventory() {
@@ -26,7 +26,10 @@ public EntityPlayer getPlayer() {
     }
 
     public int getDimension() {
-        return this.world.provider.getDimension();
+        if (this.world != null) {
+            return this.world.provider.getDimension();
+        }
+        return 0;
     }
 
     public World getWorld() {