Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 12:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

ListFlag#merge should not allow duplicates (Fixes #3157) (#3265)

Browse Source
This commit is contained in:
Pierre Maurice Schwang 2021-10-01 21:52:30 +02:00 committed by NotMyFault
parent 20c2f36f6c
commit 541255fe7e
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/src/main/java/com/plotsquared/core/plot/flag/types/ListFlag.java
View File

@ -43,8 +43,18 @@ public abstract class ListFlag<V, F extends PlotFlag<List<V>, F>> extends PlotFl
@Override
public F merge(@NonNull List<V> newValue) {
final List<V> mergedList = new ArrayList<>();
mergedList.addAll(getValue());
mergedList.addAll(newValue);
// If a server already used PS before this fix, we remove all present duplicates on an eventual merge
for (final V v : getValue()) {
if (!mergedList.contains(v)) {
mergedList.add(v);
}
}
// Only add new values if not already present from #getValue()
for (final V v : newValue) {
if (!mergedList.contains(v)) {
mergedList.add(v);
}
}
return this.flagOf(mergedList);
}