make group changes world specific

This commit is contained in:
okx-code
2018-12-12 17:04:43 +00:00
parent 6ee60f7944
commit f22e42e22d
21 changed files with 102 additions and 105 deletions
@@ -23,7 +23,7 @@ public class GroupRequirement extends Requirement {
int matched = 0;
String[] groups = getValueString().split(" ");
for (String requiredGroup : groups) {
for (String group : plugin.getPermissions().getPlayerGroups(null, player)) {
for (String group : plugin.getPermissions().getPlayerGroups(player)) {
if (group.equalsIgnoreCase(requiredGroup)) {
matched++;
break;
@@ -22,8 +22,8 @@ public class PermissionRequirement extends Requirement {
public double getRemaining(Player player) {
int matched = 0;
String[] permissions = getValueString().split(" ");
for(String permission : permissions) {
if(player.hasPermission(permission)) {
for (String permission : permissions) {
if (player.hasPermission(permission)) {
matched++;
}
}
@@ -18,7 +18,7 @@ public class PlaceholderRequirement extends Requirement {
public boolean check(Player player) {
String[] parts = getValueString().split(" ");
String parsed = PlaceholderAPI.setPlaceholders(player, parts[0]);
if(!PlaceholderAPI.containsPlaceholders(parts[0]) || parsed.equals(parts[0])) {
if (!PlaceholderAPI.containsPlaceholders(parts[0]) || parsed.equals(parts[0])) {
throw new IllegalArgumentException(parts[0] + " is not a PlaceholderAPI placeholder!");
} else if (parts.length < 3) {
throw new IllegalArgumentException("Placeholder requirements must be in the form %placeholder% <operation> string");
@@ -26,7 +26,7 @@ public class PlaceholderRequirement extends Requirement {
String value = parts[2];
// string operations
switch(parts[1]) {
switch (parts[1]) {
case "=":
return parsed.equals(value);
}
@@ -34,7 +34,7 @@ public class PlaceholderRequirement extends Requirement {
// numeric operations
double p = Double.parseDouble(parsed);
double v = Double.parseDouble(value);
switch(parts[1]) {
switch (parts[1]) {
case ">":
return p > v;
case ">=":