Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2024-11-27 21:15:28 +01:00
Code Issues Projects Releases Wiki Activity

Crops will no longer be collected with the value of 0.

Browse Source 
Hoppers will no properly obtain items in 1.10-.
This commit is contained in:
Brianna O'Keefe 2018-05-17 17:30:03 -04:00
parent b1e10d1edf
commit c3a6c92f22
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/songoda/epicfarming/handlers/FarmingHandler.java
View File

@ -34,6 +34,7 @@ public class FarmingHandler {
private void farmRunner() { private void farmRunner() {
try { try {
for (Farm farm : instance.getFarmManager().getFarms().values()) { for (Farm farm : instance.getFarmManager().getFarms().values()) {
if (farm.getLocation() == null) continue;
for (Block block : getCrops(farm, true)) { for (Block block : getCrops(farm, true)) {
Crops crop = (Crops) block.getState().getData(); Crops crop = (Crops) block.getState().getData();
@ -62,7 +63,6 @@ public class FarmingHandler {
} }
private void hopRunner() { private void hopRunner() {
for (Farm farm : instance.getFarmManager().getFarms().values()) { for (Farm farm : instance.getFarmManager().getFarms().values()) {
Block block = farm.getLocation().getBlock(); Block block = farm.getLocation().getBlock();
@ -80,19 +80,22 @@ public class FarmingHandler {
ItemStack toMove = item.clone(); ItemStack toMove = item.clone();
toMove.setAmount(amtToMove); toMove.setAmount(amtToMove);
if (canHop(hopperInventory, toMove)) { int newAmt = item.getAmount() - amtToMove;
if (canHop(hopperInventory, toMove)) {
if (newAmt <= 0)
inventory.setItem(i, null);
else
item.setAmount(newAmt);
hopperInventory.addItem(toMove); hopperInventory.addItem(toMove);
item.setAmount(item.getAmount() - amtToMove);
} }
break; break;
} }
} }
} }
} }
public boolean canHop(Inventory i, ItemStack item) { private boolean canHop(Inventory i, ItemStack item) {
try { try {
if (i.firstEmpty() != -1) { if (i.firstEmpty() != -1) {
return true; return true;
@ -122,7 +125,7 @@ public class FarmingHandler {
Random random = new Random(); Random random = new Random();
ItemStack stack = new ItemStack(CropType.getCropType(material).getYieldMaterial()); ItemStack stack = new ItemStack(CropType.getCropType(material).getYieldMaterial());
ItemStack seedStack = new ItemStack(CropType.getCropType(material).getSeedMaterial(), random.nextInt(3)); ItemStack seedStack = new ItemStack(CropType.getCropType(material).getSeedMaterial(), random.nextInt(3) + 1);
if (!canMove(farm.getInventory(), stack)) return false; if (!canMove(farm.getInventory(), stack)) return false;
farm.getInventory().addItem(stack); farm.getInventory().addItem(stack);