EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1352 from MisterErwin/master

Browse Source 
A (possible) fix to #1351
This commit is contained in:
Jesse Boyd 2016-09-14 10:17:11 +10:00 committed by GitHub
commit 63259ec269
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/src/main/java/com/intellectualcrafters/plot/flag/Flags.java
View File

@ -6,6 +6,7 @@ import com.intellectualcrafters.plot.object.PlotArea;
import com.intellectualcrafters.plot.object.RunnableVal; import com.intellectualcrafters.plot.object.RunnableVal;
import com.intellectualcrafters.plot.util.MainUtil; import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.MathMan; import com.intellectualcrafters.plot.util.MathMan;
import com.intellectualcrafters.plot.util.StringMan;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -161,7 +162,10 @@ public final class Flags {
Object remove; Object remove;
if (value.DEFAULT_FLAGS.containsKey(duplicate)) { if (value.DEFAULT_FLAGS.containsKey(duplicate)) {
remove = value.DEFAULT_FLAGS.remove(duplicate); remove = value.DEFAULT_FLAGS.remove(duplicate);
value.DEFAULT_FLAGS.put(flag,flag.parseValue("" + remove)); if (remove instanceof Collection)
value.DEFAULT_FLAGS.put(flag, flag.parseValue(StringMan.join((Collection) remove, ',')));
else
value.DEFAULT_FLAGS.put(flag,flag.parseValue("" + remove));
} }
} }
}); });
@ -169,7 +173,10 @@ public final class Flags {
@Override public void run(Plot value) { @Override public void run(Plot value) {
if (value.getFlags().containsKey(duplicate)) { if (value.getFlags().containsKey(duplicate)) {
Object remove = value.getFlags().remove(duplicate); Object remove = value.getFlags().remove(duplicate);
value.getFlags().put(flag,flag.parseValue("" + remove)); if (remove instanceof Collection)
value.getFlags().put(flag, flag.parseValue(StringMan.join((Collection) remove, ',')));
else
value.getFlags().put(flag,flag.parseValue("" + remove));
} }
} }
}); });