Do not resolve pm target when player can't see it

Brikster · Jun 30, 2024 · 73baee5 · 73baee5
1 parent f2417c1
commit 73baee5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/spigot/src/main/java/ru/brikster/chatty/pm/MsgCommandHandler.java b/spigot/src/main/java/ru/brikster/chatty/pm/MsgCommandHandler.java
@@ -24,7 +24,7 @@ public void execute(@NotNull CommandContext<CommandSender> commandContext) {
         CommandSender sender = commandContext.getSender();
 
         String targetName = commandContext.get("target");
-        PmMessageTarget target = pmMessageService.resolveTarget(targetName, true);
+        PmMessageTarget target = pmMessageService.resolveTarget(sender, targetName, true);
         if (target == null) {
             audiences.sender(sender).sendMessage(messagesConfig.getPmPlayerNotFound());
             return;

diff --git a/spigot/src/main/java/ru/brikster/chatty/pm/PmMessageService.java b/spigot/src/main/java/ru/brikster/chatty/pm/PmMessageService.java
@@ -53,13 +53,20 @@ public class PmMessageService {
             .expireAfterAccess(Duration.ofMinutes(10))
             .build();
 
-    public @Nullable PmMessageTarget resolveTarget(String targetName, boolean allowConsole) {
+    public @Nullable PmMessageTarget resolveTarget(CommandSender sender,
+                                                   String targetName,
+                                                   boolean allowConsole) {
         PmMessageTarget target = null;
         if (allowConsole && pmConfig.isAllowConsole() && targetName.equalsIgnoreCase("Console")) {
             target = new CommandSenderPmMessageTarget(Bukkit.getConsoleSender());
         } else {
             Player targetPlayer = Bukkit.getPlayer(targetName);
             if (targetPlayer != null) {
+                // return null if target is vanished
+                if (sender instanceof Player
+                    && !((Player) sender).canSee(targetPlayer)) {
+                    return null;
+                }
                 target = new CommandSenderPmMessageTarget(targetPlayer);
             }
         }

diff --git a/spigot/src/main/java/ru/brikster/chatty/pm/ignore/AddIgnoreCommandHandler.java b/spigot/src/main/java/ru/brikster/chatty/pm/ignore/AddIgnoreCommandHandler.java
@@ -31,7 +31,7 @@ public void execute(@NotNull CommandContext<CommandSender> commandContext) {
 
         UUID targetUuid;
 
-        PmMessageTarget target = pmMessageService.resolveTarget(targetName, false);
+        PmMessageTarget target = pmMessageService.resolveTarget(sender, targetName, false);
         if (target == null) {
             targetUuid = repository.getCachedUuid(targetName);
         } else {

diff --git a/spigot/src/main/java/ru/brikster/chatty/pm/ignore/RemoveIgnoreCommandHandler.java b/spigot/src/main/java/ru/brikster/chatty/pm/ignore/RemoveIgnoreCommandHandler.java
@@ -31,7 +31,7 @@ public void execute(@NotNull CommandContext<CommandSender> commandContext) {
 
         UUID targetUuid;
 
-        PmMessageTarget target = pmMessageService.resolveTarget(targetName, false);
+        PmMessageTarget target = pmMessageService.resolveTarget(sender, targetName, false);
         if (target == null) {
             targetUuid = repository.getCachedUuid(targetName);
         } else {