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同意该请求。"