From 7313674d1ef467cbf66332ae0c00a9e8aadd2749 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sun, 1 Apr 2018 04:46:01 +1000 Subject: + More Exotic Farmer Module work. --- .../xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/sc2/modules/workers') diff --git a/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java b/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java index 50d544100f..48f8cfa9a7 100644 --- a/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java +++ b/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java @@ -211,8 +211,8 @@ public abstract class ModuleExoticFarmer extends ModuleFarmer { return false; } - public boolean isSeedValid(final ItemStack seed) { - return seed.getItem() == Items.wheat_seeds || seed.getItem() == Items.potato || seed.getItem() == Items.carrot; + public boolean isSeedValid(final ItemStack seed) { + return getBlockFromPams(seed) != null || seed.getItem() == Items.wheat_seeds || seed.getItem() == Items.potato || seed.getItem() == Items.carrot; } public Block getCropFromSeed(final ItemStack seed) { @@ -438,11 +438,4 @@ public abstract class ModuleExoticFarmer extends ModuleFarmer { return block instanceof BlockCrops && m == 7; } - protected boolean isFarming() { - if (this.isPlaceholder()) { - return this.getSimInfo().getIsFarming(); - } - return this.getCart().isEngineBurning() && this.getDw(0) != 0; - } - } \ No newline at end of file -- cgit