Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2024-09-29 07:07:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2019-10-17 12:55:30 -04:00
commit 9a60972b05
4 changed files with 11 additions and 16 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:
name: "EpicFarming"
path: "/builds/$CI_PROJECT_PATH"
version: "3.0.1"
version: "3.0.2"
build:
stage: build

9
src/main/java/com/songoda/epicfarming/farming/levels/modules/Module.java
View File

@ -37,15 +37,18 @@ public abstract class Module {
public abstract int runEveryXTicks();
private int currentTick = 0;
private Map<Farm, Integer> currentTicks = new HashMap<>();
public void run(Farm farm, Collection<LivingEntity> 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<LivingEntity> entitiesAroundFarm);

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

@ -50,8 +50,6 @@ public class ModuleAutoCollect extends Module {
}
private void collectCrops(Farm farm) {
HashMap<Material, Boolean> hasDropped = new HashMap();
for (Block block : getCrops(farm, true)) {
Material mat = block.getType();
if (!CropType.isCrop(mat)) continue;
@ -59,8 +57,7 @@ public class ModuleAutoCollect extends Module {
if (!BlockUtils.isCropFullyGrown(block)) {
// Add to GrowthTask
plugin.getGrowthTask().addLiveCrop(block.getLocation(), new Crop(block.getLocation(), farm));
} else if (isEnabled(farm) && !hasDropped.getOrDefault(mat, false) && doCropDrop(farm, mat)) {
hasDropped.put(mat, true);
} else if (isEnabled(farm) && doCropDrop(farm, mat)) {
if (farm.getLevel().isAutoReplant()) {
BlockUtils.resetGrowthStage(block);

11
src/main/java/com/songoda/epicfarming/tasks/FarmTask.java
View File

@ -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 {