Merge pull request #2725 from BentoBoxWorld/develop

Release 3.7.3

Author: tastybento

pom.xml

@@ -75,7 +75,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>3.7.2</build.version>
+        <build.version>3.7.3</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <server.jars>${project.basedir}/lib</server.jars>

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminRegisterCommand.java

@@ -129,6 +129,8 @@ void register(User user, String targetName) {
         if (island.isSpawn()) {
             getIslands().clearSpawn(island.getWorld());
         }
+        // Remove deletion status if it has been assigned.
+        island.setDeleted(false);
         user.sendMessage("commands.admin.register.registered-island", TextVariables.XYZ,
                 Util.xyz(island.getCenter().toVector()), TextVariables.NAME, targetName);
         user.sendMessage("general.success");
@@ -151,4 +153,4 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
         return Optional.of(Util.tabLimit(options, lastArg));
     }
 
-}
+}

src/main/java/world/bentobox/bentobox/api/commands/admin/purge/AdminPurgeRegionsCommand.java

@@ -358,8 +358,8 @@ private void findIslands(World world, int days) {
 
     private void displayIsland(Island island) {
         // Log the island data
-        if (island.isDeleted()) {
-            getPlugin().log("Deleted island at " + Util.xyz(island.getCenter().toVector()) + " in world " + getWorld().getName() + " will be deleted");
+        if (island.isPurgable()) {
+            getPlugin().log("Purgable island at " + Util.xyz(island.getCenter().toVector()) + " in world " + getWorld().getName() + " will be deleted");
             return;
         }
         if (island.getOwner() == null) {
@@ -402,8 +402,8 @@ private String formatLocalTimestamp(Long millis) {
      * @return true means “cannot delete”
      */
     private boolean canDeleteIsland(Island island) {
-        // If the island is marked for deletion, it can be deleted at any time
-        if (island.isDeleted()) {
+        // If the island is purgeable, it can be deleted at any time
+        if (island.isPurgable()) {
             return false;
         }
         long cutoffMillis = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(days);

src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java

@@ -56,7 +56,7 @@ public boolean canExecute(User user, String label, List<String> args) {
             return false;
         }
         if (!getIslands().hasIsland(getWorld(), user.getUniqueId())) {
-            user.sendMessage("general.errors.no-island");
+            user.sendMessage("general.errors.not-owner");
             return false;
         }
         int resetsLeft = getPlayers().getResetsLeft(getWorld(), user.getUniqueId());

src/main/java/world/bentobox/bentobox/database/objects/Island.java

@@ -71,6 +71,10 @@ public class Island implements DataObject, MetaDataAble {
     // True if this island is deleted and pending deletion from the database
     @Expose
     private boolean deleted = false;
+    
+    // True if this island is purgable from the database
+    @Expose
+    private boolean purgable = false;
 
     @Expose
     @NonNull
@@ -267,6 +271,7 @@ public Island(Island island) {
         });
         this.createdDate = island.getCreatedDate();
         this.deleted = island.isDeleted();
+        this.purgable = island.isPurgable();
         this.doNotLoad = island.isDoNotLoad();
         this.flags.putAll(island.getFlags());
         this.gameMode = island.getGameMode();
@@ -2118,5 +2123,19 @@ public boolean equals(Object obj) {
         return Objects.equals(uniqueId, other.uniqueId);
     }
 
+    /**
+     * @return the purgable
+     */
+    public boolean isPurgable() {
+        return purgable;
+    }
+
+    /**
+     * @param purgable the purgable to set
+     */
+    public void setPurgable(boolean purgable) {
+        this.purgable = purgable;
+        setChanged();
+    }
 
 }

src/main/java/world/bentobox/bentobox/listeners/teleports/AbstractTeleportListener.java

@@ -205,12 +205,12 @@ protected int calculateSearchRadius(Location location, Island island)
             int x = Math.abs(island.getProtectionCenter().getBlockX() - location.getBlockX());
             int z = Math.abs(island.getProtectionCenter().getBlockZ() - location.getBlockZ());
 
-            diff = Math.min(this.plugin.getSettings().getSafeSpotSearchRange(),
-                    island.getProtectionRange() - Math.max(x, z));
+            diff = Math.min(this.plugin.getSettings().getMinPortalSearchRadius(),
+                    island.getProtectionRange() + (island.getRange() - island.getProtectionRange())*2 - Math.max(x, z));
         }
         else
         {
-            diff = this.plugin.getSettings().getSafeSpotSearchRange();
+            diff = this.plugin.getSettings().getMinPortalSearchRadius();
         }
 
         return diff;

src/main/java/world/bentobox/bentobox/managers/IslandsManager.java

@@ -289,6 +289,8 @@ public void deleteIsland(@NonNull Island island, boolean removeBlocks, @Nullable
             removePlayersFromIsland(island);
             // Mark island as deleted
             island.setDeleted(true);
+            // Mark as purgeable
+            island.setPurgable(true);
             if (!plugin.getSettings().isKeepPreviousIslandOnReset()) {            
                 // Remove island from the cache
                 islandCache.deleteIslandFromCache(island);
@@ -1306,9 +1308,8 @@ public void load() throws IOException {
             if (island.isDeleted()) {
                 // These will be deleted later
                 deletedIslands.add(island.getUniqueId());
-            }
-            // Check island distance and if incorrect stop BentoBox
-            if (!plugin.getSettings().isOverrideSafetyCheck() && island.getWorld() != null
+            } // Check island distance and if incorrect stop BentoBox
+            else if (!plugin.getSettings().isOverrideSafetyCheck() && island.getWorld() != null
                     && plugin.getIWM().inWorld(island.getWorld())
                     && island.getRange() != plugin.getIWM().getIslandDistance(island.getWorld())) {
                 throw new IOException("Island distance mismatch!\n" + "World '" + island.getWorld().getName()

src/test/java/world/bentobox/bentobox/database/objects/IslandTest.java

@@ -1281,10 +1281,17 @@ public void testIsDeleted() {
      */
     @Test
     public void testSetDeleted() {
+        assertFalse(i.isDeleted());
         i.setDeleted(true);
         assertTrue(i.isDeleted());
         i.setDeleted(false);
         assertFalse(i.isDeleted());
+        
+        assertFalse(i.isPurgable());
+        i.setPurgable(true);
+        assertTrue(i.isPurgable());
+        i.setPurgable(false);
+        assertFalse(i.isPurgable());
     }
 
     /**