From dc673f9715cc6eb0e1f84f4195f040a421639744 Mon Sep 17 00:00:00 2001
From: MattBDev <mattbdev@outlook.com>
Date: Sat, 26 Nov 2016 11:55:38 -0500
Subject: [PATCH] Fixed #1440 , Fixed #1446

---
 .../intellectualcrafters/plot/util/MainUtil.java  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
index 3fb03b31e..a1a309a00 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
@@ -157,11 +157,10 @@ public class MainUtil {
                         writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(filename)).append(CRLF);
                         writer.append("Content-Transfer-Encoding: binary").append(CRLF);
                         writer.append(CRLF).flush();
-                        OutputStream nonClosable = new AbstractDelegateOutputStream(output) {
+                        writeTask.value = new AbstractDelegateOutputStream(output) {
                             @Override
-                            public void close() throws IOException {  } // Don't close
+                            public void close() {  } // Don't close
                         };
-                        writeTask.value = nonClosable;
                         writeTask.run();
                         output.flush();
                         writer.append(CRLF).flush();
@@ -486,11 +485,11 @@ public class MainUtil {
         String[] split = arg.split(";|,");
         PlotId id;
         if (split.length == 4) {
-            area = PS.get().getPlotAreaByString(split[0] + ";" + split[1]);
-            id = PlotId.fromString(split[2] + ";" + split[3]);
+            area = PS.get().getPlotAreaByString(split[0] + ';' + split[1]);
+            id = PlotId.fromString(split[2] + ';' + split[3]);
         } else if (split.length == 3) {
             area = PS.get().getPlotAreaByString(split[0]);
-            id = PlotId.fromString(split[1] + ";" + split[2]);
+            id = PlotId.fromString(split[1] + ';' + split[2]);
         } else if (split.length == 2) {
             id = PlotId.fromString(arg);
         } else {
@@ -688,7 +687,7 @@ public class MainUtil {
                 // Invalid
                 return Collections.emptySet();
             }
-            if (name.equals("*")) {
+            if ("*".equals(name)) {
                 result.add(DBFunc.everyone);
                 continue;
             }
@@ -726,7 +725,7 @@ public class MainUtil {
         String members = getPlayerList(plot.getMembers());
         String denied = getPlayerList(plot.getDenied());
         String seen;
-        if (Settings.Enabled_Components.PLOT_EXPIRY) {
+        if (Settings.Enabled_Components.PLOT_EXPIRY && ExpireManager.IMP != null) {
             if (plot.isOnline()) {
                 seen = C.NOW.s();
             } else {