Merge branch 'development'

This commit is contained in:
Brianna 2019-10-23 21:21:43 -04:00
commit e7c7172601
2 changed files with 2 additions and 2 deletions

View File

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

View File

@ -178,7 +178,7 @@ public class ModuleAutoCollect extends Module {
Block b2 = block.getWorld().getBlockAt(bx + fx, by + fy, bz + fz);
CompatibleMaterial mat = CompatibleMaterial.getMaterial(b2.getType());
if (!mat.isCrop()) continue;
if (mat == null || !mat.isCrop()) continue;
if (add) {
farm.addCachedCrop(b2);