revert per-word permissions

This commit is contained in:
okx-code
2018-12-16 18:57:06 +00:00
parent ac6945431a
commit bcf33cf5ea
4 changed files with 9 additions and 9 deletions
+6 -6
View File
@@ -325,8 +325,8 @@ public class Rankup extends JavaPlugin {
oldRank.applyRequirements(player);
permissions.playerRemoveGroup(player, oldRank.getRank());
permissions.playerAddGroup(player, rank.getRank());
permissions.playerRemoveGroup(null, player, oldRank.getRank());
permissions.playerAddGroup(null, player, rank.getRank());
getMessage(oldRank, Message.SUCCESS_PUBLIC)
.failIfEmpty()
@@ -400,12 +400,12 @@ public class Rankup extends JavaPlugin {
oldPrestige.applyRequirements(player);
permissions.playerRemoveGroup(player, oldPrestige.getFrom());
permissions.playerAddGroup(player, oldPrestige.getTo());
permissions.playerRemoveGroup(null, player, oldPrestige.getFrom());
permissions.playerAddGroup(null, player, oldPrestige.getTo());
if (oldPrestige.getRank() != null) {
permissions.playerRemoveGroup(player, oldPrestige.getRank());
permissions.playerRemoveGroup(null, player, oldPrestige.getRank());
}
permissions.playerAddGroup(player, prestige.getRank());
permissions.playerAddGroup(null, player, prestige.getRank());
getMessage(oldPrestige, Message.PRESTIGE_SUCCESS_PUBLIC)
.failIfEmpty()
@@ -46,7 +46,7 @@ public class Prestige extends Rank {
}
public boolean isEligable(Player player) {
String[] groups = plugin.getPermissions().getPlayerGroups(player);
String[] groups = plugin.getPermissions().getPlayerGroups(null, player);
for (String group : groups) {
if (group.equalsIgnoreCase(from)) {
return true;
+1 -1
View File
@@ -60,7 +60,7 @@ public class Rank {
}
public boolean isIn(Player player) {
String[] groups = plugin.getPermissions().getPlayerGroups(player);
String[] groups = plugin.getPermissions().getPlayerGroups(null, player);
for (String group : groups) {
if (group.equalsIgnoreCase(rank)) {
return true;
@@ -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(player)) {
for (String group : plugin.getPermissions().getPlayerGroups(null, player)) {
if (group.equalsIgnoreCase(requiredGroup)) {
matched++;
break;