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-21 11:21:27 -04:00
commit 2fc23003ab
5 changed files with 15 additions and 17 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.2"
version: "3.0.3"
build:
stage: build

2
src/main/java/com/songoda/epicfarming/EpicFarming.java
View File

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

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

@ -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();

19
src/main/java/com/songoda/epicfarming/tasks/GrowthTask.java
View File

@ -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);

7
src/main/java/com/songoda/epicfarming/tasks/HopperTask.java
View File

@ -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;
}