Merge branch 'development'

.gitlab-ci.yml

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

pom.xml

@@ -2,7 +2,7 @@
     <groupId>com.songoda</groupId>
     <artifactId>EpicHoppers</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>maven-version-number</version>
+    <version>4.4</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>EpicHoppers-${project.version}</finalName>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.14.1</version>
+            <version>1.15</version>
         </dependency>
         <dependency>
             <groupId>com.songoda</groupId>

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

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;