Merge branch 'development'

This commit is contained in:
Brianna 2019-10-16 23:12:09 -04:00
commit 76a52c8a09
3 changed files with 4 additions and 3 deletions

View File

@ -4,7 +4,7 @@ stages:
variables:
name: "EpicFarming"
path: "/builds/$CI_PROJECT_PATH"
version: "3"
version: "3.0.1"
build:
stage: build

View File

@ -61,8 +61,8 @@ public class ModuleAutoBreeding extends Module {
}
boolean mate1 = false;
for (Map.Entry<EntityType, Long> entry : counts.entrySet()) {
boolean mate1 = false;
for (LivingEntity entity : entities) {
if (entry.getKey() != entity.getType()) continue;
@ -107,6 +107,7 @@ public class ModuleAutoBreeding extends Module {
}
handleBreed(entity);
mate1 = true;
break;
}
}
}

View File

@ -47,7 +47,7 @@ public class ModuleAutoButcher extends Module {
for (LivingEntity entity : entities) {
int stackSize = EntityStackerManager.getSize(entity);
if (stackSize == 0) stackSize = 1;
count = stackSize;
count += stackSize;
}
if (count <= 2 || !farm.willFit(new ItemStack(Material.STONE))) return;