From 948b4f191539a44a95dd1a6ef95c5c2a22a839a9 Mon Sep 17 00:00:00 2001
From: CarmJos <KarmunJ@outlook.com>
Date: Thu, 24 Feb 2022 16:00:24 +0800
Subject: [PATCH] =?UTF-8?q?[F]=20=E4=BF=AE=E5=A4=8D=E7=8E=A9=E5=AE=B6?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=BB=99=E8=87=AA=E5=B7=B1=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E4=BC=A0=E9=80=81=E8=AF=B7=E6=B1=82=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/carm/plugin/moeteleport/command/tpa/TpaCommand.java  | 6 ++++++
 .../plugin/moeteleport/configuration/PluginMessages.java    | 1 +
 src/main/resources/messages.yml                             | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/src/main/java/cc/carm/plugin/moeteleport/command/tpa/TpaCommand.java b/src/main/java/cc/carm/plugin/moeteleport/command/tpa/TpaCommand.java
index c87f4a4..08576d1 100644
--- a/src/main/java/cc/carm/plugin/moeteleport/command/tpa/TpaCommand.java
+++ b/src/main/java/cc/carm/plugin/moeteleport/command/tpa/TpaCommand.java
@@ -23,6 +23,12 @@ public class TpaCommand implements CommandExecutor {
             return true;
         }
 
+        if (player == target) {
+            // fix #5 - 玩家给自己发送传送请求
+            PluginMessages.SELF_REQUEST.sendWithPlaceholders(player);
+            return true;
+        }
+
         TeleportRequest request = Main.getUserManager().getData(target).getReceivedRequests().get(player.getUniqueId());
         if (request != null) {
             PluginMessages.Request.DUPLICATE.sendWithPlaceholders(sender,
diff --git a/src/main/java/cc/carm/plugin/moeteleport/configuration/PluginMessages.java b/src/main/java/cc/carm/plugin/moeteleport/configuration/PluginMessages.java
index 596db5e..23d1db8 100644
--- a/src/main/java/cc/carm/plugin/moeteleport/configuration/PluginMessages.java
+++ b/src/main/java/cc/carm/plugin/moeteleport/configuration/PluginMessages.java
@@ -8,6 +8,7 @@ public class PluginMessages {
     public static final ConfigMessageList NO_LAST_LOCATION = new ConfigMessageList("no-last-location");
 
     public static final ConfigMessageList NOT_ONLINE = new ConfigMessageList("not-online");
+    public static final ConfigMessageList SELF_REQUEST = new ConfigMessageList("self-request");
 
     public static final ConfigMessageList TPA = new ConfigMessageList("tpa");
     public static final ConfigMessageList TPA_HERE = new ConfigMessageList("tpahere");
diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml
index 3542177..6c62075 100644
--- a/src/main/resources/messages.yml
+++ b/src/main/resources/messages.yml
@@ -6,6 +6,10 @@ death-back:
 
 not-online:
   - "&f目标玩家并不在线，无法发送请求。"
+
+self-request:
+  - "&f您不能向自己发送请求。"
+
 tpa:
   - "&d%(player) &f请求传送到您身边，您有 &5%(expire)秒 &f的时间回应。"
   - "[&a&l[同意]](show_text=点击同意请求 run_command=/tpAccept %(player)) &f输入 &5/tpAccept &f同意该请求。"