Merge pull request #2680 from BentoBoxWorld/2679_Box_gets_reused_even_though_it_should_not

2679 box gets reused even though it should not

Author: tastybento

pom.xml

@@ -74,7 +74,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.3.5</build.version>
+        <build.version>3.4.0</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/managers/IslandsManager.java

@@ -284,24 +284,24 @@ public void deleteIsland(@NonNull Island island, boolean removeBlocks, @Nullable
         // Set the owner of the island to no one.
         island.setOwner(null);
         island.setFlag(Flags.LOCK, RanksManager.VISITOR_RANK);
-        island.setDeleted(true);
         if (removeBlocks) {
-            // Remove island from the cache
-            islandCache.deleteIslandFromCache(island);
             // Remove players from island
             removePlayersFromIsland(island);
             if (!plugin.getSettings().isKeepPreviousIslandOnReset()) {
+                island.setDeleted(true);
+                // Remove island from the cache
+                islandCache.deleteIslandFromCache(island);
                 // Remove blocks from world
                 IslandDeletion id = new IslandDeletion(island);
                 plugin.getIslandDeletionManager().getIslandChunkDeletionManager().add(id);
                 // Tell other servers
                 MultiLib.notify("bentobox-deleteIsland", getGson().toJson(id));
+                // Delete the island from the database
+                handler.deleteObject(island);
             } else {
                 // Fire the deletion event immediately
                 IslandEvent.builder().deletedIslandInfo(new IslandDeletion(island)).reason(Reason.DELETED).build();
             }
-            // Delete the island from the database
-            handler.deleteObject(island);
         }
     }