From 3ce225c0441436317def6ee35f4cb242e57f4f5c Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sun, 19 Jun 2016 15:51:46 +1000
Subject: [PATCH] Bump version

---
 .../plotsquared/general/commands/Command.java | 21 ++++++++++++-------
 build.gradle                                  |  2 +-
 pom.xml                                       |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Core/src/main/java/com/plotsquared/general/commands/Command.java b/Core/src/main/java/com/plotsquared/general/commands/Command.java
index 9e68dffcb..3f750287f 100644
--- a/Core/src/main/java/com/plotsquared/general/commands/Command.java
+++ b/Core/src/main/java/com/plotsquared/general/commands/Command.java
@@ -1,5 +1,6 @@
 package com.plotsquared.general.commands;
 
+import com.intellectualcrafters.configuration.file.YamlConfiguration;
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.commands.CommandCategory;
 import com.intellectualcrafters.plot.commands.MainCommand;
@@ -176,25 +177,26 @@ public abstract class Command {
         options.put("usage", declaration.usage());
         options.put("confirmation", declaration.confirmation());
         boolean set = false;
+        YamlConfiguration commands = PS.get() == null ? new YamlConfiguration() : PS.get().commands;
         for (Map.Entry<String, Object> entry : options.entrySet()) {
             String key = this.getFullId() + "." + entry.getKey();
-            if (!PS.get().commands.contains(key)) {
-                PS.get().commands.set(key, entry.getValue());
+            if (!commands.contains(key)) {
+                commands.set(key, entry.getValue());
                 set = true;
             }
         }
-        if (set) {
+        if (set && PS.get() != null) {
             try {
-                PS.get().commands.save(PS.get().commandsFile);
+                commands.save(PS.get().commandsFile);
             } catch (IOException e) {
                 e.printStackTrace();
 
             }
         }
-        this.aliases = PS.get().commands.getStringList(this.getFullId() + ".aliases");
-        this.description = PS.get().commands.getString(this.getFullId() + ".description");
-        this.usage = PS.get().commands.getString(this.getFullId() + ".usage");
-        this.confirmation = PS.get().commands.getBoolean(this.getFullId() + ".confirmation");
+        this.aliases = commands.getStringList(this.getFullId() + ".aliases");
+        this.description = commands.getString(this.getFullId() + ".description");
+        this.usage = commands.getString(this.getFullId() + ".usage");
+        this.confirmation = commands.getBoolean(this.getFullId() + ".confirmation");
         if (this.parent != null) {
             this.parent.register(this);
         }
@@ -432,6 +434,9 @@ public abstract class Command {
     }
 
     public boolean canExecute(PlotPlayer player, boolean message) {
+        if (player == null) {
+            return true;
+        }
         if (!this.required.allows(player)) {
             if (message) {
                 MainUtil.sendMessage(player, this.required == RequiredType.PLAYER ? C.IS_CONSOLE : C.NOT_CONSOLE);
diff --git a/build.gradle b/build.gradle
index 472be8617..352bcebc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ ext {
     git = Grgit.open(file(".git"))
     revision = "-${git.head().abbreviatedId}"
 }
-version = "3.4.1${revision}"
+version = "3.4.2${revision}"
 description = """PlotSquared"""
 
 subprojects {
diff --git a/pom.xml b/pom.xml
index 363786274..aa2803783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <artifactId>PlotSquared</artifactId>
-  <version>3.4.1-SNAPSHOT</version>
+  <version>3.4.2-SNAPSHOT</version>
   <name>PlotSquared</name>
   <packaging>jar</packaging>
   <build>