From 109fd75dbde200a1f9428e0099c2ab5cc6e181f8 Mon Sep 17 00:00:00 2001 From: Brianna Date: Wed, 4 Dec 2019 16:44:13 -0500 Subject: [PATCH 1/5] Wait for other plugins to load before loading levels. --- src/main/java/com/songoda/epichoppers/EpicHoppers.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/songoda/epichoppers/EpicHoppers.java b/src/main/java/com/songoda/epichoppers/EpicHoppers.java index 14d347e..82f79ce 100644 --- a/src/main/java/com/songoda/epichoppers/EpicHoppers.java +++ b/src/main/java/com/songoda/epichoppers/EpicHoppers.java @@ -108,7 +108,6 @@ public class EpicHoppers extends SongodaPlugin { this.playerDataManager = new PlayerDataManager(); this.boostManager = new BoostManager(); - this.loadLevelManager(); this.checkStorage(); // Load from file @@ -172,6 +171,7 @@ public class EpicHoppers extends SongodaPlugin { * Register hoppers into HopperManger from configuration */ Bukkit.getScheduler().runTaskLater(this, () -> { + this.loadLevelManager(); if (storage.containsGroup("sync")) { for (StorageRow row : storage.getRowsByGroup("sync")) { Location location = Methods.unserializeLocation(row.getKey()); From 9962c91efc86f27c9236c7a98e638ec837b26b15 Mon Sep 17 00:00:00 2001 From: Brianna Date: Wed, 4 Dec 2019 16:44:29 -0500 Subject: [PATCH 2/5] FIx for a weird storage issue. --- src/main/java/com/songoda/epichoppers/storage/Storage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/songoda/epichoppers/storage/Storage.java b/src/main/java/com/songoda/epichoppers/storage/Storage.java index eb45574..2759d60 100644 --- a/src/main/java/com/songoda/epichoppers/storage/Storage.java +++ b/src/main/java/com/songoda/epichoppers/storage/Storage.java @@ -30,7 +30,7 @@ public abstract class Storage { /* * Dump HopperManager to file. */ - for (Hopper hopper : instance.getHopperManager().getHoppers().values()) { + for (Hopper hopper : new ArrayList<>(instance.getHopperManager().getHoppers().values())) { if (hopper.getLevel() == null || hopper.getLocation() == null) continue; From 870e8e1da16cc649cefff30e71e64e754621a27a Mon Sep 17 00:00:00 2001 From: Brianna Date: Wed, 11 Dec 2019 16:19:27 -0500 Subject: [PATCH 3/5] Added 1.15 Support. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 141989c..858a0a4 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ org.spigotmc spigot - 1.14.1 + 1.15 com.songoda From e7f872ed851ea5528f0889f0817162bb923cccbc Mon Sep 17 00:00:00 2001 From: Brianna Date: Wed, 11 Dec 2019 16:20:11 -0500 Subject: [PATCH 4/5] Removed CI --- .gitlab-ci.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 649ed8f..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,21 +0,0 @@ -stages: - - build - -variables: - name: "EpicHoppers" - path: "/builds/$CI_PROJECT_PATH" - version: "4.3.11" - -build: - stage: build - image: maven:3.5.3-jdk-8 - script: - - find $path/ -type f -name "*.xml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g - - find $path/ -type f -name "*.yml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g - - mvn clean package - - find $path/ -depth -path '*original*' -delete - - mv $path/target/*.jar $path/ - artifacts: - name: $name-$version - paths: - - "$path/*.jar" From 64b36c0502870e79e3216bf1c6ee230d587cd7ca Mon Sep 17 00:00:00 2001 From: Brianna Date: Wed, 11 Dec 2019 16:20:20 -0500 Subject: [PATCH 5/5] version 4.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 858a0a4..40bc773 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda EpicHoppers 4.0.0 - maven-version-number + 4.4 clean install EpicHoppers-${project.version}