Merge branch 'development'

.gitlab-ci.yml

@@ -1,21 +0,0 @@
-stages:
-  - build
-
-variables:
-  name: "UltimateKits"
-  path: "/builds/$CI_PROJECT_PATH"
-  version: "2.4.13"
-
-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>UltimateKits</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>maven-version-number</version>
+    <version>2.4.14</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>UltimateKits-${project.version}</finalName>
@@ -96,8 +96,8 @@
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.14.4-R0.1-SNAPSHOT</version>
+            <artifactId>spigot</artifactId>
+            <version>1.15</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/com/songoda/ultimatekits/gui/KitGeneralOptionsGui.java

@@ -49,10 +49,11 @@ public class KitGeneralOptionsGui extends Gui {
                         final String num = msg != null ? msg.replaceAll("[^0-9]", "") : "";
                         if (!num.isEmpty()) {
                             try {
-                                kit.setDelay(Integer.parseInt(num));
+                                kit.setDelay(Integer.parseInt(num.trim()));
                                 updateItemLore(event.slot, plugin.getLocale().getMessage("interface.kitoptions.delaylore")
                                         .processPlaceholder("delay", kit.getDelay()).getMessage().split("\\|"));
                                 aevent.player.closeInventory();
+                                return;
                             } catch (NumberFormatException e) {
                             }
                         }