From 3e99f90eb1bb6304f21ccbe70a6af1883eae959d Mon Sep 17 00:00:00 2001
From: Hannes Greule <hannesgreule@outlook.de>
Date: Wed, 9 Dec 2020 22:45:47 +0100
Subject: [PATCH] Don't spit NPEs on NonNull values

---
 .../src/main/java/com/plotsquared/core/command/Command.java | 2 +-
 .../com/plotsquared/core/configuration/caption/Caption.java | 2 --
 .../core/configuration/caption/LocalizedCaptionMap.java     | 6 +++++-
 Core/src/main/resources/lang/messages_en.json               | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Core/src/main/java/com/plotsquared/core/command/Command.java b/Core/src/main/java/com/plotsquared/core/command/Command.java
index ef325eec0..74d82aaa5 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Command.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Command.java
@@ -401,9 +401,9 @@ public abstract class Command {
 
     public int getMatch(String[] args, Command cmd, PlotPlayer<?> player) {
         String perm = cmd.getPermission();
-        HashSet<String> desc = new HashSet<>();
         int count = cmd.getAliases().stream().filter(alias -> alias.startsWith(args[0]))
             .mapToInt(alias -> 5).sum();
+        HashSet<String> desc = new HashSet<>();
         Collections.addAll(desc, cmd.getDescription().getComponent(player).split(" "));
         for (String arg : args) {
             if (perm.startsWith(arg)) {
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java
index f826b7ed2..ffc9a8ef8 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java
@@ -25,8 +25,6 @@
  */
 package com.plotsquared.core.configuration.caption;
 
-import com.plotsquared.core.configuration.caption.LocaleHolder;
-
 import javax.annotation.Nonnull;
 
 /**
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/caption/LocalizedCaptionMap.java b/Core/src/main/java/com/plotsquared/core/configuration/caption/LocalizedCaptionMap.java
index 8412e21c9..e46838d3e 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/caption/LocalizedCaptionMap.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/caption/LocalizedCaptionMap.java
@@ -42,7 +42,11 @@ public class LocalizedCaptionMap implements CaptionMap {
     }
 
     @Override @Nonnull public String getMessage(@Nonnull final TranslatableCaption caption) {
-        return this.captions.get(caption);
+        String message = this.captions.get(caption);
+        if (message == null) {
+            throw new NoSuchCaptionException(caption);
+        }
+        return message;
     }
 
     @Override @Nonnull public String getMessage(@Nonnull final TranslatableCaption caption,
diff --git a/Core/src/main/resources/lang/messages_en.json b/Core/src/main/resources/lang/messages_en.json
index 26a574dce..b56724841 100644
--- a/Core/src/main/resources/lang/messages_en.json
+++ b/Core/src/main/resources/lang/messages_en.json
@@ -675,7 +675,6 @@
   "commands.description.backup.save": "<gray>Create a plot backup.</gray>",
   "commands.description.backup.list": "<gray>List available plot backups.</gray>",
   "commands.description.backup.load": "<gray>Restore a plot backup</gray>",
-  "commands.description.biome": "<gray>Set the plot biome.</gray>",
   "commands.description.buy": "<gray>Buy the plot you are standing on.</gray>",
   "commands.description.caps": "<gray>Show plot entity caps.</gray>",
   "commands.description.chat": "<gray>Toggles plot chat on or off.</gray>",
@@ -699,7 +698,6 @@
   "commands.description.debugsavetest": "<gray>This command will force the recreation of all plots in the database.</gray>",
   "commands.description.delete": "<gray>Delete the plot you stand on.</gray>",
   "commands.description.deny": "<gray>Deny a user from entering a plot.</gray>",
-  "commands.description.desc": "<gray>Set the plot description.</gray>",
   "commands.description.dislike": "<gray>Dislike the plot.</gray>",
   "commands.description.done": "<gray>Continue a plot that was previously marked as done.</gray>",
   "commands.description.download": "<gray>Download your plot.</gray>",
@@ -724,7 +722,6 @@
   "commands.description.move": "<gray>Move a plot.</gray>",
   "commands.description.music": "<gray>Play music in your plot.</gray>",
   "commands.description.near": "<gray>Display nearby players.</gray>",
-  "commands.description.owner": "<gray>Set the plot owner.</gray>",
   "commands.description.plugin": "<gray>Show plugin information.</gray>",
   "commands.description.purge": "<gray>Purge all plots for a world.</gray>",
   "commands.description.rate": "<gray>Rate a plot.</gray>",
@@ -735,7 +732,10 @@
   "commands.description.save": "<gray>Save your plot.</gray>",
   "commands.description.schematic": "<gray>Manage schematics.</gray>",
   "commands.description.set": "<gray>Set a plot value.</gray>",
+  "commands.description.setbiome": "<gray>Set the plot biome.</gray>",
+  "commands.description.setdescription": "<gray>Set the plot description.</gray>",
   "commands.description.sethome": "<gray>Set the plot home.</gray>",
+  "commands.description.setowner": "<gray>Set the plot owner.</gray>",
   "commands.description.setup": "<gray>Setup wizard for plot worlds.</gray>",
   "commands.description.swap": "<gray>Swap two plots.</gray>",
   "commands.description.target": "<gray>Target a plot with your compass.</gray>",