Merge pull request #83 from BentoBoxWorld/develop

Version 2.6.0

Author: tastybento

.github/.gitignore

@@ -0,0 +1 @@
+/.DS_Store

.github/workflows/build.yml

@@ -14,11 +14,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:

pom.xml

@@ -58,14 +58,14 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>2.0.0-SNAPSHOT</bentobox.version>
+        <spigot.version>1.21-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>2.4.0-SNAPSHOT</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>2.5.0</build.version>
+        <build.version>2.6.0</build.version>
 
         <sonar.projectKey>BentoBoxWorld_Boxed</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
@@ -178,7 +178,36 @@
             <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+             <groupId>org.spigotmc.....</groupId>
+             <artifactId>spigot</artifactId>
+             <version>1.21-R0.1-SNAPSHOT</version>
+             <scope>provided</scope>
+        </dependency>
+        <dependency>
+             <groupId>org.spigotmc....</groupId>
+             <artifactId>spigot</artifactId>
+             <version>1.20.6-R0.1-SNAPSHOT</version>
+             <scope>provided</scope>
+        </dependency>
+        <dependency>
+             <groupId>org.spigotmc.</groupId>
+             <artifactId>spigot</artifactId>
+             <version>1.20.3-R0.1-SNAPSHOT</version>
+             <scope>provided</scope>
+        </dependency>
+        <dependency>
+             <groupId>org.spigotmc..</groupId>
+             <artifactId>spigot</artifactId>
+             <version>1.20.2-R0.1-SNAPSHOT</version>
+             <scope>provided</scope>
+        </dependency> 
+        <dependency>
+             <groupId>org.spigotmc...</groupId>
+             <artifactId>spigot</artifactId>
+             <version>1.20.1-R0.1-SNAPSHOT</version>
+             <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/world/bentobox/boxed/Settings.java

@@ -11,6 +11,7 @@
 import org.bukkit.GameMode;
 import org.bukkit.entity.EntityType;
 
+import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.configuration.ConfigComment;
 import world.bentobox.bentobox.api.configuration.ConfigEntry;
 import world.bentobox.bentobox.api.configuration.StoreAt;
@@ -106,6 +107,7 @@ public class Settings implements WorldSettings {
     private int ticksPerMonsterSpawns = -1;
 
     @ConfigComment("Radius of player area. (So distance between player starting spots is twice this)")
+    @ConfigComment("MUST BE A FACTOR OF 16. If not, it will be rounded to be one.")
     @ConfigComment("It is the same for every dimension : Overworld, Nether and End.")
     @ConfigEntry(path = "world.area-radius", needsReset = true)
     private int islandDistance = 320;
@@ -494,6 +496,11 @@ public Difficulty getDifficulty() {
      */
     @Override
     public int getIslandDistance() {
+        if (islandDistance % 16 != 0) {
+            islandDistance = islandDistance - (islandDistance % 16);
+            BentoBox.getInstance()
+                    .logWarning("Boxed: Area radius is not a factor of 16. Rounding to " + islandDistance);
+        }
         return islandDistance;
     }
 

src/main/java/world/bentobox/boxed/listeners/EnderPearlListener.java

@@ -45,15 +45,16 @@ public void onPlayerTeleport(PlayerTeleportEvent e) {
                 ) {
             return;
         }
-        
+
         User u = User.getInstance(e.getPlayer());
         // If the to-location is outside the box, cancel it
         if (e.getTo() != null) {
-            Island i = addon.getIslands().getIsland(e.getFrom().getWorld(), u);
-            if (i == null || !i.onIsland(e.getTo())) {
-                u.sendMessage("boxed.general.errors.no-teleport-outside");
-                e.setCancelled(true);
-            }
+            addon.getIslands().getIslandAt(e.getTo()).ifPresent(i -> {
+                if (!i.onIsland(e.getTo())) {
+                    u.sendMessage("boxed.general.errors.no-teleport-outside");
+                    e.setCancelled(true);
+                }
+            });
         }
     }
 
@@ -77,7 +78,7 @@ public void onEnderPearlLand(ProjectileHitEvent e) {
             if (is == null) {
                 return; // Nothing to do
             }
-            
+
             // Get the box that the player is in
             addon.getIslands().getIslandAt(u.getLocation()).ifPresent(fromIsland -> {
                 // Check that it is their box