fix: add proper world checks

cerus · Aug 16, 2024 · 84ad5a1 · 84ad5a1
1 parent 9cef0e9
commit 84ad5a1
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ of <a href="https://github.com/cerus/packet-maps">packet-maps</a>.</p>
 • Advanced engine features
 like [alpha compositing](https://en.wikipedia.org/wiki/Alpha_compositing) ([Image](https://cerus.dev/img/maps_alpha_composition.png))\
 • Efficient click handling\
-• Supports 1.16.5 - 1.21
+• Supports 1.16.5 - 1.21.1
 
 **What is the point of the plugin module?**\
 See [FAQ](#FAQ)
@@ -50,7 +50,7 @@ See [FAQ](#FAQ)
     <dependency>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>common</artifactId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
         <scope>provided</scope> <!-- "provided" if the maps plugin is on the server, "compile" if not -->
     </dependency>
 
@@ -59,7 +59,7 @@ See [FAQ](#FAQ)
     <dependency>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
         <scope>provided</scope>
     </dependency>
 </dependencies>

diff --git a/bukkit-16_R3/pom.xml b/bukkit-16_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-17_R1/pom.xml b/bukkit-17_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-18_R1/pom.xml b/bukkit-18_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-18_R2/pom.xml b/bukkit-18_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-19_R1/pom.xml b/bukkit-19_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-19_R2/pom.xml b/bukkit-19_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bukkit-19_R3/pom.xml b/bukkit-19_R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
 
     <artifactId>bukkit-19_R3</artifactId>

diff --git a/bukkit-20_R1/pom.xml b/bukkit-20_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
 
     <artifactId>bukkit-20_R1</artifactId>

diff --git a/bukkit-20_R2/pom.xml b/bukkit-20_R2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
 
     <artifactId>bukkit-20_R2</artifactId>

diff --git a/bukkit-20_R3/pom.xml b/bukkit-20_R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
 
     <artifactId>bukkit-20_R3</artifactId>

diff --git a/bukkit-20_R4/pom.xml b/bukkit-20_R4/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
 
     <artifactId>bukkit-20_R4</artifactId>

diff --git a/bukkit-21_R1/pom.xml b/bukkit-21_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
 
     <artifactId>bukkit-21_R1</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.6</version>
+        <version>3.8.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/plugin/src/main/java/dev/cerus/maps/plugin/listener/PlayerListener.java b/plugin/src/main/java/dev/cerus/maps/plugin/listener/PlayerListener.java
@@ -55,6 +55,9 @@ private boolean call(final Player player, final boolean rightClick) {
         if (this.useTriangulation) {
             final Location playerLoc = player.getLocation();
             for (final MapScreen screen : MapScreenRegistry.getScreens()) {
+                if (player.getWorld() != screen.getLocation().getWorld()) {
+                    continue;
+                }
                 final double dist = playerLoc.distanceSquared(screen.getLocation());
                 if (dist < MAX_DISTANCE_TO_SCREEN) { // Only run calculations for screens in range
                     final Vec2 coords = ScreenTriangulation.triangulateScreenCoords(player, screen);

diff --git a/plugin/src/main/java/dev/cerus/maps/version/VersionAdapterFactory.java b/plugin/src/main/java/dev/cerus/maps/version/VersionAdapterFactory.java
@@ -24,7 +24,7 @@ public VersionAdapter makeAdapter() {
             case "1.20.2" -> new VersionAdapter20R2();
             case "1.20.3", "1.20.4" -> new VersionAdapter20R3();
             case "1.20.5", "1.20.6" -> new VersionAdapter20R4();
-            case "1.21" -> new VersionAdapter21R1();
+            case "1.21", "1.21.1" -> new VersionAdapter21R1();
             default -> null;
         };
     }

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.cerus.maps</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.8.6</version>
+    <version>3.8.7</version>
     <modules>
         <module>common</module>
         <module>bukkit-16_R3</module>