diff --git a/build.gradle b/build.gradle
index 9f3210eb..b91729d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -123,7 +123,7 @@ dependencies {
 
     // Tests
     testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10'
-    testImplementation 'com.github.seeseemelk:MockBukkit-v1.20:3.19.2'
+    testImplementation 'com.github.seeseemelk:MockBukkit-v1.20:3.20.2'
     testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
index 5eccd922..dece119b 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -151,10 +151,6 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
      */
     @Override
     public void onDisable() {
-        if (serviceLocator == null) {
-            // TODO: This is a workaround while waiting for MockBukkit to fix their onDisable being called twice
-            return;
-        }
         this.saveAllConfigs();
         shutdownDependencyInjection();
         Logging.shutdown();