diff --git a/src/com/github/ss111/ConflictHelper.java b/src/com/github/ss111/ConflictHelper.java index e5c9fc6..7027f9d 100644 --- a/src/com/github/ss111/ConflictHelper.java +++ b/src/com/github/ss111/ConflictHelper.java @@ -40,13 +40,15 @@ public static Boolean isConflicting(MultiValueMap map, Integer key, String type) } else { ArrayList namesArray = new ArrayList(); + ArrayList configArray = new ArrayList(); for (ArrayList combo : names) { namesArray.add(combo.toArray()[0].toString()); + configArray.add(combo.toArray()[1].toString()); } - if (namesArray.toArray()[0].toString().equals(namesArray.toArray()[1].toString())) { + if (namesArray.toArray()[0].toString().equals(namesArray.toArray()[1].toString()) || configArray.toArray()[0].toString().equals(configArray.toArray()[1].toString())) { return false;