Merge pull request #661 from Multiverse/fix/handle-disabled-share

Fix handling of disabled shares with ll destination and share handling

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/destination/LastLocationDestinationInstance.java

@@ -44,17 +44,22 @@ public final class LastLocationDestinationInstance extends DestinationInstance<L
 
         var playerWorld = player.getWorld().getName();
         if (playerWorld.equals(worldName)) {
+            // teleporting within same world
             return worldManager.getLoadedWorld(worldName).map(MultiverseWorld::getSpawnLocation);
         }
 
         for (var group : worldGroupManager.getGroupsForWorld(worldName)) {
             Logging.finer("LastLocationDestination: group: " + group);
             if (!group.containsWorld(playerWorld) && group.getApplicableShares().contains(Sharables.LAST_LOCATION)) {
+                // teleporting to a different world group
                 return Option.of(profileContainerStoreProvider.getStore(ContainerType.GROUP)
                         .getContainer(group.getName())
                         .getPlayerProfileNow(player)
                         .get(Sharables.LAST_LOCATION))
                         .orElse(() -> worldManager.getLoadedWorld(worldName).map(MultiverseWorld::getSpawnLocation));
+            } else if (group.getDisabledShares().contains(Sharables.LAST_LOCATION)) {
+                // last location disabled for the group and hence should not apply, defaulting to world's spawn
+                return worldManager.getLoadedWorld(worldName).map(MultiverseWorld::getSpawnLocation);
             }
         }
 

src/main/java/org/mvplugins/multiverse/inventories/handleshare/ReadOnlyShareHandler.java

@@ -23,6 +23,7 @@ protected void prepareProfiles() {
         for (WorldGroup worldGroup : worldGroups) {
             affectedProfiles.addReadProfile(worldGroup.getGroupProfileContainer().getProfileKey(player), worldGroup.getApplicableShares());
             unhandledShares.removeAll(worldGroup.getApplicableShares());
+            unhandledShares.removeAll(worldGroup.getDisabledShares());
         }
         if (!unhandledShares.isEmpty()) {
             affectedProfiles.addReadProfile(

src/main/java/org/mvplugins/multiverse/inventories/handleshare/WriteOnlyShareHandler.java

@@ -38,6 +38,7 @@ protected void prepareProfiles() {
                     worldGroup.getApplicableShares()
             );
             unhandledShares.removeAll(worldGroup.getApplicableShares());
+            unhandledShares.removeAll(worldGroup.getDisabledShares());
         }
         Shares sharesToWrite = inventoriesConfig.getAlwaysWriteWorldProfile()
                 ? Sharables.enabled()