From 789da29af0fbd6b95a256bc3cb53b76dc8958b61 Mon Sep 17 00:00:00 2001 From: Nirek-K Date: Sun, 5 Jun 2016 19:18:02 -0500 Subject: [PATCH] Fix #1293 Prevent nulls from passing Agricraft harvest Update HC compat --- .../forestry/farming/logic/CropBasicAgriCraft.java | 2 ++ .../forestry/plugins/compat/PluginHarvestCraft.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java b/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java index 97750b269..b9d6e2e29 100644 --- a/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java +++ b/src/main/java/forestry/farming/logic/CropBasicAgriCraft.java @@ -12,6 +12,7 @@ package forestry.farming.logic; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -47,6 +48,7 @@ public class CropBasicAgriCraft extends Crop { harvest.remove(0); Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, Blocks.melon_block, 0); world.setBlockMetadataWithNotify(pos.x, pos.y, pos.z, 0, Constants.FLAG_BLOCK_SYNCH); + harvest.removeAll(Collections.singleton(null)); //sanatize nulls that get thru from Agricraft+Harvestcraft (sesameseed) return harvest; } diff --git a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java index abc5c49dc..a674937bb 100644 --- a/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java +++ b/src/main/java/forestry/plugins/compat/PluginHarvestCraft.java @@ -89,7 +89,8 @@ public class PluginHarvestCraft extends ForestryPlugin { "persimmon", "avocado", "coconut", - "durian" + "durian", + "gooseberry" ); ImmutableList trees = ImmutableList.of( @@ -112,7 +113,8 @@ public class PluginHarvestCraft extends ForestryPlugin { ImmutableList spices = ImmutableList.of( "ginger", - "spiceleaf" + "spiceleaf", + "curryleaf" //"mustardseed" Mustard is inconsistent and annoying. ); @@ -149,7 +151,8 @@ public class PluginHarvestCraft extends ForestryPlugin { "wintersquash", "zucchini", "bambooshoot", - "spinach" + "spinach", + "waterchestnut" ); ImmutableList grains = ImmutableList.of( @@ -159,7 +162,8 @@ public class PluginHarvestCraft extends ForestryPlugin { ); ImmutableList cropNuts = ImmutableList.of( - "peanut" + "peanut", + "sesameseeds" ); ImmutableList nuts = ImmutableList.of(