Catch a bug, leave a 1.12 TODO

DenizenScript · Jun 13, 2017 · 7f3ce3b · 7f3ce3b
1 parent 24a9807
commit 7f3ce3b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java b/plugin/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -376,7 +376,7 @@ public void onEnable() {
             return;
         }
 
-        if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_11_R1)) {
+        if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_11_R1)) { // TODO: 1.12 update
             logInterceptor = new LogInterceptor();
         }
 
@@ -962,7 +962,9 @@ public void onDisable() {
         OldEventManager.doEvents(Arrays.asList("shutdown"), new BukkitScriptEntryData(null, null), context);
 
         // Disable the log interceptor... otherwise bad things on /reload
-        logInterceptor.standardOutput();
+        if (logInterceptor != null) {
+            logInterceptor.standardOutput();
+        }
 
         // Save notables
         notableManager.saveNotables();