Merge pull request #226 from M0diis/resolve-223

Resolve #223
HelpChat · Feb 28, 2024 · e8dda63 · e8dda63
2 parents 189214f + aa99703
commit e8dda63
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/plugin/src/main/java/at/helpch/chatchat/util/ChannelUtils.java b/plugin/src/main/java/at/helpch/chatchat/util/ChannelUtils.java
@@ -5,6 +5,7 @@
 import at.helpch.chatchat.api.user.User;
 import at.helpch.chatchat.channel.ChatChannel;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -53,6 +54,14 @@ public static boolean isTargetWithinRadius(
         if (radius != -1 && source instanceof ChatUser) {
             final Location sourceLocation = ((ChatUser) source).player().getLocation();
             final Location targetLocation = ((ChatUser) target).player().getLocation();
+
+            final World sourceWorld = sourceLocation.getWorld();
+            final World targetWorld = targetLocation.getWorld();
+
+            if(sourceWorld != null && targetWorld != null && !sourceWorld.getUID().equals(targetWorld.getUID())) {
+                return false;
+            }
+
             final int relativeX = targetLocation.getBlockX() - sourceLocation.getBlockX();
             final int relativeZ = targetLocation.getBlockZ() - sourceLocation.getBlockZ();