From d690a38fa24be17d1d64b87b0f29144e75c095c4 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 3 Jul 2016 22:16:00 -0700 Subject: [PATCH] Fix #1340 Rare NPE from BeekeepingLogic.queenWorkTick --- gradle.properties | 2 +- src/main/java/forestry/api/apiculture/IBeeHousing.java | 3 +++ src/main/java/forestry/apiculture/BeekeepingLogic.java | 8 +++++--- .../apiculture/entities/EntityMinecartApiary.java | 5 +++++ .../apiculture/entities/EntityMinecartBeehouse.java | 2 ++ .../forestry/apiculture/multiblock/AlvearyController.java | 2 ++ .../apiculture/multiblock/FakeAlvearyController.java | 2 ++ .../java/forestry/apiculture/multiblock/TileAlveary.java | 2 ++ .../apiculture/tiles/FakeBeeHousingInventory.java | 3 +++ src/main/java/forestry/apiculture/tiles/TileApiary.java | 5 +++++ src/main/java/forestry/apiculture/tiles/TileBeeHouse.java | 5 +++++ src/main/java/forestry/apiculture/tiles/TileHive.java | 1 + 12 files changed, 36 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 28b5b986e..a0ed8fcd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ ic2_version=2.6.5-ex110 version_major=5 version_minor=1 -version_patch=8 +version_patch=9 diff --git a/src/main/java/forestry/api/apiculture/IBeeHousing.java b/src/main/java/forestry/api/apiculture/IBeeHousing.java index 833f3acbc..7d0fb9179 100644 --- a/src/main/java/forestry/api/apiculture/IBeeHousing.java +++ b/src/main/java/forestry/api/apiculture/IBeeHousing.java @@ -5,6 +5,8 @@ ******************************************************************************/ package forestry.api.apiculture; +import javax.annotation.Nonnull; + import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -32,6 +34,7 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource { */ Iterable getBeeListeners(); + @Nonnull IBeeHousingInventory getBeeInventory(); IBeekeepingLogic getBeekeepingLogic(); diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 64a3ca45f..8030226fe 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -11,6 +11,7 @@ package forestry.apiculture; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -233,7 +234,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { if (beeType == EnumBeeType.PRINCESS) { tickBreed(); } else if (beeType == EnumBeeType.QUEEN) { - queenWorkTick(queen); + queenWorkTick(queen, queenStack); } } @@ -246,7 +247,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { } } - private void queenWorkTick(IBee queen) { + private void queenWorkTick(@Nullable IBee queen, @Nonnull ItemStack queenStack) { if (queen == null) { beeProgress = 0; beeProgressMax = 0; @@ -272,7 +273,8 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { // Write the changed queen back into the item stack. NBTTagCompound nbttagcompound = new NBTTagCompound(); queen.writeToNBT(nbttagcompound); - housing.getBeeInventory().getQueen().setTagCompound(nbttagcompound); + queenStack.setTagCompound(nbttagcompound); + housing.getBeeInventory().setQueen(queenStack); } beeProgress = queen.getHealth(); diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java index b3732af60..49358dade 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartApiary.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.entities; +import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -36,8 +37,11 @@ import forestry.core.config.Config; import forestry.core.inventory.IInventoryAdapter; public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implements IApiary { + @Nonnull private static final IBeeModifier beeModifier = new ApiaryBeeModifier(); + @Nonnull private final IBeeListener beeListener = new ApiaryBeeListener(this); + @Nonnull private final InventoryApiary inventory = new InventoryApiary(getAccessHandler()); @SuppressWarnings("unused") @@ -64,6 +68,7 @@ public class EntityMinecartApiary extends EntityMinecartBeeHousingBase implement return inventory; } + @Nonnull @Override public IBeeHousingInventory getBeeInventory() { return inventory; diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java index 693f78a02..7977e3b93 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeehouse.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.entities; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; @@ -72,6 +73,7 @@ public class EntityMinecartBeehouse extends EntityMinecartBeeHousingBase { return Collections.singleton(beeListener); } + @Nonnull @Override public IBeeHousingInventory getBeeInventory() { return beeInventory; diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 1e3d1584e..687439b92 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -53,6 +53,7 @@ import forestry.core.utils.Translator; public class AlvearyController extends RectangularMultiblockControllerBase implements IAlvearyControllerInternal, IClimateControlled { + @Nonnull private final InventoryBeeHousing inventory; private final IBeekeepingLogic beekeepingLogic; @@ -77,6 +78,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple this.beeModifiers.add(new AlvearyBeeModifier()); } + @Nonnull @Override public IBeeHousingInventory getBeeInventory() { return inventory; diff --git a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java index 2fd766101..1939aeba9 100644 --- a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.multiblock; +import javax.annotation.Nonnull; import java.util.Collections; import net.minecraft.util.math.BlockPos; @@ -45,6 +46,7 @@ public class FakeAlvearyController extends FakeMultiblockController implements I return Collections.emptyList(); } + @Nonnull @Override public IBeeHousingInventory getBeeInventory() { return FakeBeeHousingInventory.instance; diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java index 0cc25e300..9b2864ede 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.multiblock; +import javax.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -99,6 +100,7 @@ public abstract class TileAlveary extends MultiblockTileEntityForestry