From 8ec97dca42b0a400be6c3d7be8f19ec3974f7477 Mon Sep 17 00:00:00 2001
From: jascotty2 <jascottytechie@gmail.com>
Date: Sun, 20 Oct 2019 16:14:49 -0500
Subject: [PATCH 1/3] cleanup, core fix for legacy carrot/potato

---
 .../songoda/epicfarming/tasks/FarmTask.java   |  2 +-
 .../songoda/epicfarming/tasks/GrowthTask.java | 19 ++++++++-----------
 .../songoda/epicfarming/tasks/HopperTask.java |  7 ++++---
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java b/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java
index 09481dc..d0a83ab 100644
--- a/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java
+++ b/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java
@@ -20,7 +20,7 @@ public class FarmTask extends BukkitRunnable {
     private static EpicFarming plugin;
 
     public static FarmTask startTask(EpicFarming pl) {
-        if (instance != null && !instance.isCancelled()) {
+        if (instance != null) {
             instance.cancel();
         }
         instance = new FarmTask();
diff --git a/src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java b/src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java
index 0e74f5f..7e19c3e 100644
--- a/src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java
+++ b/src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java
@@ -8,8 +8,11 @@ import com.songoda.epicfarming.settings.Settings;
 import com.songoda.epicfarming.utils.CropType;
 import org.bukkit.Location;
 import org.bukkit.scheduler.BukkitRunnable;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
 public class GrowthTask extends BukkitRunnable {
 
@@ -20,7 +23,7 @@ public class GrowthTask extends BukkitRunnable {
     private static final Random random = new Random();
 
     public static GrowthTask startTask(EpicFarming plugin) {
-        if (instance != null && !instance.isCancelled()) {
+        if (instance != null) {
             instance.cancel();
         }
         instance = new GrowthTask();
@@ -33,15 +36,9 @@ public class GrowthTask extends BukkitRunnable {
         List<Crop> toRemove =  new ArrayList<>();
 
         for (Crop crop : liveCrops.values()) {
-            if (crop.getFarm().getFarmType() == FarmType.LIVESTOCK) continue;
-            Location cropLocation = crop.getLocation();
-
-            int x = cropLocation.getBlockX() >> 4;
-            int z = cropLocation.getBlockZ() >> 4;
-
-            if (cropLocation.getWorld() == null || !cropLocation.getWorld().isChunkLoaded(x, z)) {
+            if (crop.getFarm().getFarmType() == FarmType.LIVESTOCK 
+                    || !crop.getFarm().isInLoadedChunk())
                 continue;
-            }
 
             if (!CropType.isGrowableCrop(crop.getLocation().getBlock().getType())) {
                 toRemove.add(crop);
diff --git a/src/main/java/com/songoda/epicfarming/tasks/HopperTask.java b/src/main/java/com/songoda/epicfarming/tasks/HopperTask.java
index a02919a..4b56a73 100644
--- a/src/main/java/com/songoda/epicfarming/tasks/HopperTask.java
+++ b/src/main/java/com/songoda/epicfarming/tasks/HopperTask.java
@@ -24,11 +24,12 @@ public class HopperTask extends BukkitRunnable {
 
 
     public static HopperTask startTask(EpicFarming plugin) {
-        if (instance == null) {
-            instance = new HopperTask(plugin);
-            instance.runTaskTimer(plugin, 0, 8);
+        if (instance != null) {
+            instance.cancel();
         }
 
+        instance = new HopperTask(plugin);
+        instance.runTaskTimer(plugin, 0, 8);
         return instance;
     }
 

From 780892ae66d23f66de3db9006635ba775c707c17 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Mon, 21 Oct 2019 11:20:45 -0400
Subject: [PATCH 2/3] Fixed a npe with boosting.

---
 src/main/java/com/songoda/epicfarming/EpicFarming.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/songoda/epicfarming/EpicFarming.java b/src/main/java/com/songoda/epicfarming/EpicFarming.java
index c3f13ab..b945e38 100644
--- a/src/main/java/com/songoda/epicfarming/EpicFarming.java
+++ b/src/main/java/com/songoda/epicfarming/EpicFarming.java
@@ -160,7 +160,7 @@ public class EpicFarming extends SongodaPlugin {
             // Adding in Boosts
             if (storage.containsGroup("boosts")) {
                 for (StorageRow row : storage.getRowsByGroup("boosts")) {
-                    if (row.getItems().get("uuid").asObject() != null)
+                    if (row.getItems().get("player").asObject() != null)
                         continue;
 
                     BoostData boostData = new BoostData(

From 9f4e698e84aabe9e79b68395abd99ab46f3828c3 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Mon, 21 Oct 2019 11:21:14 -0400
Subject: [PATCH 3/3] version 3.0.3

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 769b3af..e91feb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
 variables:
   name: "EpicFarming"
   path: "/builds/$CI_PROJECT_PATH"
-  version: "3.0.2"
+  version: "3.0.3"
 
 build:
   stage: build