diff --git a/pom.xml b/pom.xml
index 44e40f4..1cd944a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.wimbli.WorldBorder</groupId>
     <artifactId>WorldBorder</artifactId>
-    <version>2.1.4</version>
+    <version>2.1.5</version>
     <name>WorldBorder</name>
     <url>https://github.com/PryPurity/WorldBorder</url>
     <issueManagement>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!--Dynmap API-->
@@ -46,13 +46,13 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <version>1.18.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>
-            <version>1.0.6</version>
+            <version>1.0.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -64,10 +64,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/com/wimbli/WorldBorder/WorldBorder.java b/src/main/java/com/wimbli/WorldBorder/WorldBorder.java
index 816da54..cd01393 100644
--- a/src/main/java/com/wimbli/WorldBorder/WorldBorder.java
+++ b/src/main/java/com/wimbli/WorldBorder/WorldBorder.java
@@ -44,8 +44,8 @@ public class WorldBorder extends JavaPlugin {
     public void onDisable() {
         DynMapFeatures.removeAllBorders();
         Config.StopBorderTimer();
-        Config.StoreFillTask();
         Config.StopFillTask(true);
+        Config.StoreFillTask();
     }
 
     // for other plugins to hook into
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 398f443..e9e10e4 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: WorldBorder
 authors: [ Brettflan, PryPurity ]
 description: Efficient, feature-rich plugin for limiting the size of your worlds.
-version: 2.1.4
+version: 2.1.5
 api-version: 1.15
 main: com.wimbli.WorldBorder.WorldBorder
 softdepend: