From 7cd1e8ea7655ec6eed5518000f6ae87b0d3ee477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= <sauilitired@gmail.com>
Date: Mon, 17 Aug 2020 04:39:59 +0200
Subject: [PATCH] Fix command registration

---
 .../com/plotsquared/core/command/MainCommand.java     | 11 ++++++++++-
 .../com/plotsquared/core/player/ConsolePlayer.java    |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
index ee93a2809..e151c50cb 100644
--- a/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
+++ b/Core/src/main/java/com/plotsquared/core/command/MainCommand.java
@@ -42,6 +42,8 @@ import com.plotsquared.core.util.Expression;
 import com.plotsquared.core.util.Permissions;
 import com.plotsquared.core.util.task.RunnableVal2;
 import com.plotsquared.core.util.task.RunnableVal3;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -55,6 +57,8 @@ import java.util.concurrent.CompletableFuture;
     aliases = {"plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"})
 public class MainCommand extends Command {
 
+    private static final Logger logger = LoggerFactory.getLogger("P2/" + MainCommand.class.getSimpleName());
+
     private static MainCommand instance;
     public Help help;
     public Toggle toggle;
@@ -144,7 +148,12 @@ public class MainCommand extends Command {
             }
 
             for (final Class<? extends Command> command : commands) {
-                injector.getInstance(command);
+                try {
+                    injector.getInstance(command);
+                } catch (final Exception e) {
+                    logger.error("Failed to register command {}", command.getCanonicalName());
+                    e.printStackTrace();
+                }
             }
 
             // Referenced commands
diff --git a/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java b/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
index 40cd70346..2002bba37 100644
--- a/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
+++ b/Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
@@ -158,7 +158,7 @@ public class ConsolePlayer extends PlotPlayer<Actor> {
                 lastPlot.set(location.getPlot());
             }
         }
-        try (final MetaDataAccess<Location> locationMetaDataAccess = accessPersistentMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
+        try (final MetaDataAccess<Location> locationMetaDataAccess = accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
             locationMetaDataAccess.set(location);
         }
     }