Fix NPE in logic of radioactive effect (#83)

GTNewHorizons · Nov 16, 2024 · 3c6d5d0 · 3c6d5d0
1 parent 137927b
commit 3c6d5d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
 }
 
 
diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java
@@ -13,6 +13,7 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
@@ -107,11 +108,8 @@ private static void destroyEnvironment(IBeeGenome genome, IBeeHousing housing) {
             }
 
             // Some mods might use this logic? Idk, just a safety check. Might stop griefing.
-            if (!world.canMineBlock(
-                    housing.getWorld().func_152378_a(housing.getOwner().getId()),
-                    posHousing.x,
-                    posHousing.y,
-                    posHousing.z)) {
+            EntityPlayer player = world.func_152378_a(housing.getOwner().getId());
+            if (player == null || !world.canMineBlock(player, posHousing.x, posHousing.y, posHousing.z)) {
                 continue;
             }