Merge pull request #629 from Multiverse/chore/fixes

Minor fixes to prep for 5.2 release

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/config/InventoriesConfigNodes.java

@@ -167,7 +167,6 @@ public Object serialize(Shares sharables, Class<Shares> aClass) {
             .build());
 
     final ConfigNode<Boolean> applyPlayerdataOnJoin = node(ConfigNode.builder("performance.apply-playerdata-on-join", Boolean.class)
-            .comment("This will only work if save-playerdata-on-quit is set to true.")
             .comment("Minecraft will already load the most up-to-date player data and this option will generally be redundant.")
             .comment("The only possible edge case uses is if you have a need to always modify the mvinv playerdata while the player is offline.")
             .defaultValue(false)

src/main/java/org/mvplugins/multiverse/inventories/profile/group/AbstractWorldGroupManager.java

@@ -225,11 +225,6 @@ private void checkConflict(WorldGroup checkingGroup,
             // No overlapping shares.
             return;
         }
-        if (checkingGroup.getApplicableWorlds().containsAll(worldGroup.getApplicableWorlds())
-                || worldGroup.getApplicableWorlds().containsAll(checkingGroup.getApplicableWorlds())) {
-            // If one group contains all the worlds of the other, we don't consider it a conflict.
-            return;
-        }
         Logging.finer("Conflict found for %s and %s", checkingGroup.getName(), worldGroup.getName());
         conflicts.add(new GroupingConflict(checkingGroup, worldGroup, Sharables.fromShares(conflictingShares)));
     }

src/main/java/org/mvplugins/multiverse/inventories/view/ModifiableInventoryHolder.java

@@ -15,6 +15,7 @@
  *
  * @since 5.2
  */
+@ApiStatus.Experimental
 @ApiStatus.AvailableSince("5.2")
 public final class ModifiableInventoryHolder implements InventoryHolder {
     private final OfflinePlayer targetPlayer;

src/main/java/org/mvplugins/multiverse/inventories/view/ReadOnlyInventoryHolder.java

@@ -11,6 +11,7 @@
  *
  * @since 5.2
  */
+@ApiStatus.Experimental
 @ApiStatus.AvailableSince("5.2")
 public final class ReadOnlyInventoryHolder implements InventoryHolder {
     /**

src/main/resources/multiverse-inventories_en.properties

@@ -26,7 +26,7 @@ mv-inventories.error.nosharesspecified=&cYou did not specify any valid shares!
 # Conflicts
 mv-inventories.conflict.results=&cConflict found for groups: '&6{group1}&c' and '&6{group2}&c'! Both groups contains world(s) '&3{worlds}&c' that share(s): '&3{shares}&c'.
 mv-inventories.conflict.checking=Checking for conflicts in groups...
-mv-inventories.conflict.found=&cConflicts have been found... If these are not resolved, you may experience problems with your data.
+mv-inventories.conflict.found=&cConflicts have been found... If these are not resolved, you may experience problems with your player's inventory data.
 mv-inventories.conflict.notfound=No group conflicts found!
 
 # Commands