Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-09-13 00:18:12 +02:00
Code Issues Projects Releases Wiki Activity

fix efa integration with farm blocks that have an inventory, also do not pull bonemeal out of them

Browse Source
This commit is contained in:
aurora 2020-09-05 09:58:07 +00:00
parent 0960475479
commit 5347d28cf0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/songoda/epichoppers/tasks/HopTask.java
View File

@ -261,11 +261,11 @@ public class HopTask extends BukkitRunnable {
boolean isFarmItem = false;
Collection<Entity> nearbyEntities = null;
StorageContainerCache.Cache aboveCache = null;
if ((above.getType() != Material.AIR
&& (above.getType() != Material.HOPPER || HopperDirection.getDirection(above.getState().getRawData()) != HopperDirection.DOWN)
&& (aboveCache = StorageContainerCache.getCachedInventory(above)) != null)
|| !(nearbyEntities = above.getWorld().getNearbyEntities(above.getLocation().clone(), 0.5, 0.5, 0.5)).isEmpty()
|| (isFarmItem = this.isFarmItem(above))) {
if ((isFarmItem = this.isFarmItem(above))
|| (above.getType() != Material.AIR)
&& (above.getType() != Material.HOPPER || HopperDirection.getDirection(above.getState().getRawData()) != HopperDirection.DOWN)
&& (aboveCache = StorageContainerCache.getCachedInventory(above)) != null
|| !(nearbyEntities = above.getWorld().getNearbyEntities(above.getLocation().clone(), 0.5, 0.5, 0.5)).isEmpty()) {
// Get the inventory holder. Special check for EpicFarming.
// Get the slots that we can pull items from.
InventoryHolder aboveInvHolder;
@ -567,7 +567,6 @@ public class HopTask extends BukkitRunnable {
private ItemStack[] getFarmContents(Block block) {
return com.songoda.epicfarming.EpicFarming.getInstance().getFarmManager()
.getFarm(block).getItems().toArray(new ItemStack[0]);
.getFarm(block).getItems().stream().filter(i -> i.getType() != Material.BONE_MEAL).collect(Collectors.toList()).toArray(new ItemStack[0]);
}
}