diff --git a/src/main/java/com/songoda/epicfarming/farming/levels/modules/Module.java b/src/main/java/com/songoda/epicfarming/farming/levels/modules/Module.java index 6e56f8d..fdc4143 100644 --- a/src/main/java/com/songoda/epicfarming/farming/levels/modules/Module.java +++ b/src/main/java/com/songoda/epicfarming/farming/levels/modules/Module.java @@ -37,15 +37,18 @@ public abstract class Module { public abstract int runEveryXTicks(); - private int currentTick = 0; + private Map currentTicks = new HashMap<>(); public void run(Farm farm, Collection entitiesAroundFarm) { + if (!currentTicks.containsKey(farm)) + currentTicks.put(farm, 1); + int currentTick = currentTicks.get(farm); if (currentTick >= runEveryXTicks()) { runFinal(farm, entitiesAroundFarm); - currentTick = 0; + currentTicks.remove(farm); return; } - currentTick++; + currentTicks.put(farm, currentTick + 1); } public abstract void runFinal(Farm farm, Collection entitiesAroundFarm); diff --git a/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java b/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java index 3599158..09481dc 100644 --- a/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java +++ b/src/main/java/com/songoda/epicfarming/tasks/FarmTask.java @@ -1,22 +1,17 @@ package com.songoda.epicfarming.tasks; -import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.epicfarming.EpicFarming; -import com.songoda.epicfarming.boost.BoostData; import com.songoda.epicfarming.farming.Farm; import com.songoda.epicfarming.settings.Settings; -import com.songoda.epicfarming.utils.CropType; -import com.songoda.epicfarming.utils.Methods; +import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; import java.util.stream.Collectors; public class FarmTask extends BukkitRunnable {