forked from Upstream/CommandPanels
3.17.1.1
This commit is contained in:
parent
fa33ffa1f8
commit
6a5019195e
@ -1,4 +1,4 @@
|
||||
version: 3.17.1.0
|
||||
version: 3.17.1.1
|
||||
main: me.rockyhawk.commandpanels.CommandPanels
|
||||
name: CommandPanels
|
||||
author: RockyHawk
|
||||
|
@ -33,9 +33,12 @@ public class HasSections {
|
||||
continue;
|
||||
}
|
||||
|
||||
boolean endProcess = true;
|
||||
//loop through possible values and compares for hypothetical and operators
|
||||
for (int a = 0; cf.getConfigurationSection(setName).getKeys(false).size() > a; a++) {
|
||||
if(cf.isSet(setName + ".value" + a) && cf.isSet(setName + ".compare" + a)){
|
||||
//ensure the endProcess variable has been reset for another operation
|
||||
endProcess = true;
|
||||
//get the values of this statement
|
||||
String value = ChatColor.stripColor(plugin.tex.placeholders(panel, position, p, cf.getString(setName + ".value" + a)));
|
||||
String compare = ChatColor.stripColor(plugin.tex.placeholders(panel, position, p, cf.getString(setName + ".compare" + a)));
|
||||
@ -51,7 +54,6 @@ public class HasSections {
|
||||
//list of values with the or operator
|
||||
HashSet<String> values = doOperators(new HashSet<>(Collections.singletonList(value)));
|
||||
//go through all values with the or operator
|
||||
boolean endProcess = true;
|
||||
for(String val : values){
|
||||
if (hasProcess(setName, val, compare, p)) {
|
||||
endProcess = false;
|
||||
@ -65,12 +67,17 @@ public class HasSections {
|
||||
//check if the operator link between the next value/compare is OR
|
||||
if(operator.equals("OR")){
|
||||
//I can just continue because the algorithm already assumes the last sequence was true
|
||||
endProcess = false;
|
||||
continue;
|
||||
}
|
||||
return "";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
//if the has section is false move to the next has section
|
||||
if(endProcess){
|
||||
continue;
|
||||
}
|
||||
//proceed if none of the values were false
|
||||
return "." + setName + hasSection(panel, position, cf.getConfigurationSection(setName), p);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user