From bcf33cf5ea9160a664b64a4e8351b70dc2e73c8b Mon Sep 17 00:00:00 2001
From: okx-code <okx@okx.sh>
Date: Sun, 16 Dec 2018 18:57:06 +0000
Subject: [PATCH] revert per-word permissions

---
 src/main/java/sh/okx/rankup/Rankup.java              | 12 ++++++------
 src/main/java/sh/okx/rankup/prestige/Prestige.java   |  2 +-
 src/main/java/sh/okx/rankup/ranks/Rank.java          |  2 +-
 .../requirements/requirement/GroupRequirement.java   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/sh/okx/rankup/Rankup.java b/src/main/java/sh/okx/rankup/Rankup.java
index de1bd79..91c0309 100644
--- a/src/main/java/sh/okx/rankup/Rankup.java
+++ b/src/main/java/sh/okx/rankup/Rankup.java
@@ -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()
diff --git a/src/main/java/sh/okx/rankup/prestige/Prestige.java b/src/main/java/sh/okx/rankup/prestige/Prestige.java
index 630a73d..3f98616 100644
--- a/src/main/java/sh/okx/rankup/prestige/Prestige.java
+++ b/src/main/java/sh/okx/rankup/prestige/Prestige.java
@@ -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;
diff --git a/src/main/java/sh/okx/rankup/ranks/Rank.java b/src/main/java/sh/okx/rankup/ranks/Rank.java
index 820fd91..03f4b7c 100644
--- a/src/main/java/sh/okx/rankup/ranks/Rank.java
+++ b/src/main/java/sh/okx/rankup/ranks/Rank.java
@@ -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;
diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/GroupRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/GroupRequirement.java
index 6e89548..be6a39c 100644
--- a/src/main/java/sh/okx/rankup/requirements/requirement/GroupRequirement.java
+++ b/src/main/java/sh/okx/rankup/requirements/requirement/GroupRequirement.java
@@ -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;