From d8f19cec667c84d22c65b25cbe1d1a6e55045817 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Fri, 4 Jun 2021 19:17:20 +0200
Subject: [PATCH] Adjust improper origin -> target message of plot moving

---
 Core/src/main/java/com/plotsquared/core/command/Copy.java | 6 +-----
 Core/src/main/java/com/plotsquared/core/command/Move.java | 6 +-----
 Core/src/main/java/com/plotsquared/core/command/Swap.java | 6 +-----
 Core/src/main/resources/lang/messages_en.json             | 1 +
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Core/src/main/java/com/plotsquared/core/command/Copy.java b/Core/src/main/java/com/plotsquared/core/command/Copy.java
index fa9f98cb6..73ff98ccf 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Copy.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java
@@ -66,11 +66,7 @@ public class Copy extends SubCommand {
             return false;
         }
         if (plot1.equals(plot2)) {
-            player.sendMessage(TranslatableCaption.of("invalid.not_valid_plot_id"));
-            player.sendMessage(
-                    TranslatableCaption.of("commandconfig.command_syntax"),
-                    Template.of("value", "/plot copy <X;Z>")
-            );
+            player.sendMessage(TranslatableCaption.of("invalid.origin_cant_be_target"));
             return false;
         }
         if (!plot1.getArea().isCompatible(plot2.getArea())) {
diff --git a/Core/src/main/java/com/plotsquared/core/command/Move.java b/Core/src/main/java/com/plotsquared/core/command/Move.java
index d7414b6a7..85dd26fb3 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Move.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Move.java
@@ -92,11 +92,7 @@ public class Move extends SubCommand {
             plot2 = area.getPlotAbs(plot1.getId());
         }
         if (plot1.equals(plot2)) {
-            player.sendMessage(TranslatableCaption.of("invalid.not_valid_plot_id"));
-            player.sendMessage(
-                    TranslatableCaption.of("commandconfig.command_syntax"),
-                    Template.of("value", "/plot copy <X;Z>")
-            );
+            player.sendMessage(TranslatableCaption.of("invalid.origin_cant_be_target"));
             return CompletableFuture.completedFuture(false);
         }
         if (!plot1.getArea().isCompatible(plot2.getArea()) && (!override || !Permissions
diff --git a/Core/src/main/java/com/plotsquared/core/command/Swap.java b/Core/src/main/java/com/plotsquared/core/command/Swap.java
index f0935287c..3c7ccf651 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Swap.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Swap.java
@@ -70,11 +70,7 @@ public class Swap extends SubCommand {
             return CompletableFuture.completedFuture(false);
         }
         if (plot1.equals(plot2)) {
-            player.sendMessage(TranslatableCaption.of("invalid.not_valid_plot_id"));
-            player.sendMessage(
-                    TranslatableCaption.of("commandconfig.command_syntax"),
-                    Template.of("value", "/plot copy <X;Z>")
-            );
+            player.sendMessage(TranslatableCaption.of("invalid.origin_cant_be_target"));
             return CompletableFuture.completedFuture(false);
         }
         if (!plot1.getArea().isCompatible(plot2.getArea())) {
diff --git a/Core/src/main/resources/lang/messages_en.json b/Core/src/main/resources/lang/messages_en.json
index 467df158d..ff437a8f2 100644
--- a/Core/src/main/resources/lang/messages_en.json
+++ b/Core/src/main/resources/lang/messages_en.json
@@ -218,6 +218,7 @@
   "invalid.not_allowed_block": "<prefix><red>That block is not allowed: <gray><value></gray></red>",
   "invalid.not_valid_number": "<prefix><red>That's not a valid number within the range: </red><gray><value></gray>",
   "invalid.not_valid_plot_id": "<prefix><red>That's not a valid plot ID.</red>",
+  "invalid.origin_cant_be_target": "<prefix><red>The origin and target location cannot be the same.</red>",
   "invalid.found_no_plots": "<prefix><red>Found no plots with your search query.</red>",
   "invalid.number_not_in_range": "<prefix><red>That's not a valid number within the range: <gray>(<min>, <max>)</gray></red>",
   "invalid.number_not_positive": "<red>That's not a positive number: <gray><value></gray></red>",