Skip to content

Commit 84c6824

Browse files
committed
Group is conflicting even if one group contains all the worlds of the other
1 parent 87e3b0e commit 84c6824

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,6 @@ private void checkConflict(WorldGroup checkingGroup,
225225
// No overlapping shares.
226226
return;
227227
}
228-
if (checkingGroup.getApplicableWorlds().containsAll(worldGroup.getApplicableWorlds())
229-
|| worldGroup.getApplicableWorlds().containsAll(checkingGroup.getApplicableWorlds())) {
230-
// If one group contains all the worlds of the other, we don't consider it a conflict.
231-
return;
232-
}
233228
Logging.finer("Conflict found for %s and %s", checkingGroup.getName(), worldGroup.getName());
234229
conflicts.add(new GroupingConflict(checkingGroup, worldGroup, Sharables.fromShares(conflictingShares)));
235230
}

src/main/resources/multiverse-inventories_en.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mv-inventories.error.nosharesspecified=&cYou did not specify any valid shares!
2626
# Conflicts
2727
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'.
2828
mv-inventories.conflict.checking=Checking for conflicts in groups...
29-
mv-inventories.conflict.found=&cConflicts have been found... If these are not resolved, you may experience problems with your data.
29+
mv-inventories.conflict.found=&cConflicts have been found... If these are not resolved, you may experience problems with your player's inventory data.
3030
mv-inventories.conflict.notfound=No group conflicts found!
3131

3232
# Commands

0 commit comments

Comments
 (0)