From d31968d190dff57c5a4c322a4f99f7f1ae5428aa Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Thu, 2 Jul 2015 09:08:38 -0500 Subject: [PATCH] Fix #746 point princess/drone triggers to master TE for errorstates --- .../forestry/apiculture/trigger/TriggerMissingDrone.java | 6 +++++- .../forestry/apiculture/trigger/TriggerMissingQueen.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java index 9c9070519..c3d1d21a5 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java @@ -14,6 +14,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import forestry.apiculture.gadgets.TileAlveary; import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.triggers.Trigger; @@ -36,7 +37,10 @@ public class TriggerMissingDrone extends Trigger { if (!(tile instanceof IErrorSource)) { return false; } - + if (tile instanceof TileAlveary) { + tile = (TileAlveary) ((TileAlveary) tile).getCentralTE(); + } + return ((IErrorSource) tile).getErrorStates().contains(EnumErrorCode.NODRONE); } diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java index 651db9eab..9f8bc5cad 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java @@ -14,6 +14,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import forestry.apiculture.gadgets.TileAlveary; import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.triggers.Trigger; @@ -36,6 +37,9 @@ public class TriggerMissingQueen extends Trigger { if (!(tile instanceof IErrorSource)) { return false; } + if (tile instanceof TileAlveary) { + tile = (TileAlveary) ((TileAlveary) tile).getCentralTE(); + } return ((IErrorSource) tile).getErrorStates().contains(EnumErrorCode.NOQUEEN); }