From 588f5d7ebcc66fe482ecf1fc87ba20fd0243646b Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 9 Apr 2016 22:48:27 +1000
Subject: [PATCH] Fixes #1047

---
 .../com/intellectualcrafters/plot/commands/MainCommand.java     | 2 +-
 Core/src/main/java/com/intellectualcrafters/plot/config/C.java  | 1 -
 .../main/java/com/intellectualcrafters/plot/util/MainUtil.java  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
index 154a214aa..e87650144 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
@@ -134,7 +134,7 @@ public class MainCommand extends Command {
             @Override
             public void run(final Command cmd, final Runnable success, final Runnable failure) {
                 if (cmd.hasConfirmation(player) ) {
-                    CmdConfirm.addPending(player, "/plot area create pos2 (Creates world)", new Runnable() {
+                    CmdConfirm.addPending(player, cmd.getUsage(), new Runnable() {
                         @Override
                         public void run() {
                             if (EconHandler.manager != null) {
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/config/C.java b/Core/src/main/java/com/intellectualcrafters/plot/config/C.java
index a33cb177f..c3abd620e 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/config/C.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/config/C.java
@@ -290,7 +290,6 @@ public enum C {
     TASK_START("Starting task...", "Core"),
     PREFIX("$3[$1P2$3] $2", "Core"),
     ENABLED("$1PlotSquared is now enabled", "Core"),
-    EXAMPLE_MESSAGE("$2This is an example message &k!!!", "Core"),
     /*
      * Reload
      */
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 d494b8cdd..f3774963f 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
@@ -721,7 +721,7 @@ public class MainUtil {
                             expires = String.format("%d days", TimeUnit.MILLISECONDS.toDays(l));
                         }
                     }
-                } else {
+                } else if (ExpireManager.IMP != null) {
                     long timestamp = ExpireManager.IMP.getTimestamp(plot.owner);
                     long compared = System.currentTimeMillis() - timestamp;
                     long l = Settings.AUTO_CLEAR_DAYS - TimeUnit.MILLISECONDS.toDays(compared);