Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
* @since 5.2
*/
@ApiStatus.Experimental
@ApiStatus.AvailableSince("5.2")
public final class ModifiableInventoryHolder implements InventoryHolder {
private final OfflinePlayer targetPlayer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*
* @since 5.2
*/
@ApiStatus.Experimental
@ApiStatus.AvailableSince("5.2")
public final class ReadOnlyInventoryHolder implements InventoryHolder {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/multiverse-inventories_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down