Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2025-02-22 07:21:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

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

2
src/main/java/com/songoda/epicfarming/farming/levels/modules/ModuleAutoCollect.java
View File

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