From 170d34df48ecdba7af521c6c16fd8fa168fe7152 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Sun, 30 Nov 2014 10:53:34 -0800 Subject: [PATCH] Revert "Merge pull request #579 from Spyboticsguy/master" This reverts commit c3e4a56b799b486ca95829fd3c157e8ec545ba31, reversing changes made to bef6642de61867c78aa4d01ae79d74ecdf7489c0. --- pom.xml | 2 +- .../vault/chat/plugins/Chat_DroxPerms.java | 30 ++++++---------- .../plugins/Permission_DroxPerms.java | 36 ++++++++----------- 3 files changed, 25 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index a63f57d..db63be2 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms de.hydrox.bukkit DroxPerms - 1.0.0-SNAPSHOT + 0.5.0 true diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_DroxPerms.java b/src/net/milkbowl/vault/chat/plugins/Chat_DroxPerms.java index 9f47980..777026d 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_DroxPerms.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_DroxPerms.java @@ -14,7 +14,6 @@ import org.bukkit.plugin.Plugin; import de.hydrox.bukkit.DroxPerms.DroxPerms; import de.hydrox.bukkit.DroxPerms.DroxPermsAPI; -import java.util.UUID; public class Chat_DroxPerms extends Chat { private static final Logger log = Logger.getLogger("Minecraft"); @@ -63,10 +62,9 @@ public class Chat_DroxPerms extends Chat { @Override public String getPlayerPrefix(String world, String player) { - UUID uuid = API.getUUIDFromName(player); - String prefix = API.getPlayerInfo(uuid, "prefix"); + String prefix = API.getPlayerInfo(player, "prefix"); if (prefix == null) { - String prigroup = API.getPlayerGroup(uuid); + String prigroup = API.getPlayerGroup(player); prefix = API.getGroupInfo(prigroup, "prefix"); } return prefix; @@ -74,20 +72,17 @@ public class Chat_DroxPerms extends Chat { @Override public void setPlayerPrefix(String world, String player, String prefix) { - UUID uuid = API.getUUIDFromName(player); - API.setPlayerInfo(uuid, "prefix", prefix); + API.setPlayerInfo(player, "prefix", prefix); } @Override public String getPlayerSuffix(String world, String player) { - UUID uuid = API.getUUIDFromName(player); - return API.getPlayerInfo(uuid, "suffix"); + return API.getPlayerInfo(player, "suffix"); } @Override public void setPlayerSuffix(String world, String player, String suffix) { - UUID uuid = API.getUUIDFromName(player); - API.setPlayerInfo(uuid, "suffix", suffix); + API.setPlayerInfo(player, "suffix", suffix); } @Override @@ -126,8 +121,7 @@ public class Chat_DroxPerms extends Chat { @Override public void setPlayerInfoInteger(String world, String player, String node, int value) { - UUID uuid = API.getUUIDFromName(player); - API.setPlayerInfo(uuid, node, String.valueOf(value)); + API.setPlayerInfo(player, node, String.valueOf(value)); } @Override @@ -165,8 +159,7 @@ public class Chat_DroxPerms extends Chat { @Override public void setPlayerInfoDouble(String world, String player, String node, double value) { - UUID uuid = API.getUUIDFromName(player); - API.setPlayerInfo(uuid, node, String.valueOf(value)); + API.setPlayerInfo(player, node, String.valueOf(value)); } @Override @@ -201,8 +194,7 @@ public class Chat_DroxPerms extends Chat { @Override public void setPlayerInfoBoolean(String world, String player, String node, boolean value) { - UUID uuid = API.getUUIDFromName(player); - API.setPlayerInfo(uuid, node, String.valueOf(value)); + API.setPlayerInfo(player, node, String.valueOf(value)); } @Override @@ -223,15 +215,13 @@ public class Chat_DroxPerms extends Chat { @Override public String getPlayerInfoString(String world, String player, String node, String defaultValue) { - UUID uuid = API.getUUIDFromName(player); - String val = API.getPlayerInfo(uuid, node); + String val = API.getPlayerInfo(player, node); return val != null ? val : defaultValue; } @Override public void setPlayerInfoString(String world, String player, String node, String value) { - UUID uuid = API.getUUIDFromName(player); - API.setPlayerInfo(uuid, node, value); + API.setPlayerInfo(player, node, value); } @Override diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_DroxPerms.java b/src/net/milkbowl/vault/permission/plugins/Permission_DroxPerms.java index ece5960..56202c4 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_DroxPerms.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_DroxPerms.java @@ -15,7 +15,6 @@ import org.bukkit.plugin.Plugin; import de.hydrox.bukkit.DroxPerms.DroxPerms; import de.hydrox.bukkit.DroxPerms.DroxPermsAPI; -import java.util.UUID; public class Permission_DroxPerms extends Permission { @@ -86,14 +85,12 @@ public class Permission_DroxPerms extends Permission { @Override public boolean playerAdd(String world, String player, String permission) { - UUID uuid = plugin.getServer().getPlayer(player).getUniqueId(); - return API.addPlayerPermission(uuid, world, permission); + return API.addPlayerPermission(player, world, permission); } @Override public boolean playerRemove(String world, String player, String permission) { - UUID uuid = plugin.getServer().getPlayer(player).getUniqueId(); - return API.removePlayerPermission(uuid, world, permission); + return API.removePlayerPermission(player, world, permission); } @Override @@ -113,50 +110,45 @@ public class Permission_DroxPerms extends Permission { @Override public boolean playerInGroup(String world, String player, String group) { - UUID uuid = API.getUUIDFromName(name); - return API.getPlayerGroup(uuid).equalsIgnoreCase(group) || API.getPlayerSubgroups(uuid).contains(group); + return API.getPlayerGroup(player).equalsIgnoreCase(group) || API.getPlayerSubgroups(player).contains(group); } @Override public boolean playerAddGroup(String world, String player, String group) { - UUID uuid = API.getUUIDFromName(name); if (useOnlySubgroups) { - return API.addPlayerSubgroup(uuid, group); + return API.addPlayerSubgroup(player, group); } else { - if ("default".equalsIgnoreCase(API.getPlayerGroup(uuid))) { - return API.setPlayerGroup(uuid, group); + if ("default".equalsIgnoreCase(API.getPlayerGroup(player))) { + return API.setPlayerGroup(player, group); } else { - return API.addPlayerSubgroup(uuid, group); + return API.addPlayerSubgroup(player, group); } } } @Override public boolean playerRemoveGroup(String world, String player, String group) { - UUID uuid = API.getUUIDFromName(name); if (useOnlySubgroups) { - return API.removePlayerSubgroup(uuid, group); + return API.removePlayerSubgroup(player, group); } else { - if (group.equalsIgnoreCase(API.getPlayerGroup(uuid))) { - return API.setPlayerGroup(uuid, "default"); + if (group.equalsIgnoreCase(API.getPlayerGroup(player))) { + return API.setPlayerGroup(player, "default"); } else { - return API.removePlayerSubgroup(uuid, group); + return API.removePlayerSubgroup(player, group); } } } @Override public String[] getPlayerGroups(String world, String player) { - UUID uuid = plugin.getServer().getPlayer(player).getUniqueId(); - ArrayList array = API.getPlayerSubgroups(uuid); - array.add(API.getPlayerGroup(uuid)); + ArrayList array = API.getPlayerSubgroups(player); + array.add(API.getPlayerGroup(player)); return array.toArray(new String[0]); } @Override public String getPrimaryGroup(String world, String player) { - UUID uuid = plugin.getServer().getPlayer(player).getUniqueId(); - return API.getPlayerGroup(uuid); + return API.getPlayerGroup(player); } @Override