mirror of https://github.com/MilkBowl/Vault.git
Update DroxPerms' UUID support
DroxPerms' API now supports UUIDs. barring a pull request to DP (I will have sent such a pull request to DP before sending this one.)
This commit is contained in:
parent
bef6642de6
commit
74be09bd41
2
pom.xml
2
pom.xml
|
@ -92,7 +92,7 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.hydrox.bukkit</groupId>
|
<groupId>de.hydrox.bukkit</groupId>
|
||||||
<artifactId>DroxPerms</artifactId>
|
<artifactId>DroxPerms</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -14,6 +14,7 @@ import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
import de.hydrox.bukkit.DroxPerms.DroxPerms;
|
import de.hydrox.bukkit.DroxPerms.DroxPerms;
|
||||||
import de.hydrox.bukkit.DroxPerms.DroxPermsAPI;
|
import de.hydrox.bukkit.DroxPerms.DroxPermsAPI;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
public class Chat_DroxPerms extends Chat {
|
public class Chat_DroxPerms extends Chat {
|
||||||
private static final Logger log = Logger.getLogger("Minecraft");
|
private static final Logger log = Logger.getLogger("Minecraft");
|
||||||
|
@ -62,9 +63,10 @@ public class Chat_DroxPerms extends Chat {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPlayerPrefix(String world, String player) {
|
public String getPlayerPrefix(String world, String player) {
|
||||||
String prefix = API.getPlayerInfo(player, "prefix");
|
UUID uuid = plugin.getServer().getPlayer(player).getUniqueId();
|
||||||
|
String prefix = API.getPlayerInfo(uuid, "prefix");
|
||||||
if (prefix == null) {
|
if (prefix == null) {
|
||||||
String prigroup = API.getPlayerGroup(player);
|
String prigroup = API.getPlayerGroup(uuid);
|
||||||
prefix = API.getGroupInfo(prigroup, "prefix");
|
prefix = API.getGroupInfo(prigroup, "prefix");
|
||||||
}
|
}
|
||||||
return prefix;
|
return prefix;
|
||||||
|
@ -72,17 +74,20 @@ public class Chat_DroxPerms extends Chat {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPlayerPrefix(String world, String player, String prefix) {
|
public void setPlayerPrefix(String world, String player, String prefix) {
|
||||||
API.setPlayerInfo(player, "prefix", prefix);
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
API.setPlayerInfo(uuid, "prefix", prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPlayerSuffix(String world, String player) {
|
public String getPlayerSuffix(String world, String player) {
|
||||||
return API.getPlayerInfo(player, "suffix");
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
return API.getPlayerInfo(uuid, "suffix");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPlayerSuffix(String world, String player, String suffix) {
|
public void setPlayerSuffix(String world, String player, String suffix) {
|
||||||
API.setPlayerInfo(player, "suffix", suffix);
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
API.setPlayerInfo(uuid, "suffix", suffix);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -121,7 +126,8 @@ public class Chat_DroxPerms extends Chat {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPlayerInfoInteger(String world, String player, String node, int value) {
|
public void setPlayerInfoInteger(String world, String player, String node, int value) {
|
||||||
API.setPlayerInfo(player, node, String.valueOf(value));
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
API.setPlayerInfo(uuid, node, String.valueOf(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -159,7 +165,8 @@ public class Chat_DroxPerms extends Chat {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPlayerInfoDouble(String world, String player, String node, double value) {
|
public void setPlayerInfoDouble(String world, String player, String node, double value) {
|
||||||
API.setPlayerInfo(player, node, String.valueOf(value));
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
API.setPlayerInfo(uuid, node, String.valueOf(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -194,7 +201,8 @@ public class Chat_DroxPerms extends Chat {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPlayerInfoBoolean(String world, String player, String node, boolean value) {
|
public void setPlayerInfoBoolean(String world, String player, String node, boolean value) {
|
||||||
API.setPlayerInfo(player, node, String.valueOf(value));
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
API.setPlayerInfo(uuid, node, String.valueOf(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -215,13 +223,15 @@ public class Chat_DroxPerms extends Chat {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPlayerInfoString(String world, String player, String node, String defaultValue) {
|
public String getPlayerInfoString(String world, String player, String node, String defaultValue) {
|
||||||
String val = API.getPlayerInfo(player, node);
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
String val = API.getPlayerInfo(uuid, node);
|
||||||
return val != null ? val : defaultValue;
|
return val != null ? val : defaultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setPlayerInfoString(String world, String player, String node, String value) {
|
public void setPlayerInfoString(String world, String player, String node, String value) {
|
||||||
API.setPlayerInfo(player, node, value);
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
API.setPlayerInfo(uuid, node, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -15,6 +15,7 @@ import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
import de.hydrox.bukkit.DroxPerms.DroxPerms;
|
import de.hydrox.bukkit.DroxPerms.DroxPerms;
|
||||||
import de.hydrox.bukkit.DroxPerms.DroxPermsAPI;
|
import de.hydrox.bukkit.DroxPerms.DroxPermsAPI;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
public class Permission_DroxPerms extends Permission {
|
public class Permission_DroxPerms extends Permission {
|
||||||
|
|
||||||
|
@ -85,12 +86,14 @@ public class Permission_DroxPerms extends Permission {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean playerAdd(String world, String player, String permission) {
|
public boolean playerAdd(String world, String player, String permission) {
|
||||||
return API.addPlayerPermission(player, world, permission);
|
UUID uuid = plugin.getServer().getPlayer(player).getUniqueId();
|
||||||
|
return API.addPlayerPermission(uuid, world, permission);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean playerRemove(String world, String player, String permission) {
|
public boolean playerRemove(String world, String player, String permission) {
|
||||||
return API.removePlayerPermission(player, world, permission);
|
UUID uuid = plugin.getServer().getPlayer(player).getUniqueId();
|
||||||
|
return API.removePlayerPermission(uuid, world, permission);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -110,45 +113,50 @@ public class Permission_DroxPerms extends Permission {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean playerInGroup(String world, String player, String group) {
|
public boolean playerInGroup(String world, String player, String group) {
|
||||||
return API.getPlayerGroup(player).equalsIgnoreCase(group) || API.getPlayerSubgroups(player).contains(group);
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
|
return API.getPlayerGroup(uuid).equalsIgnoreCase(group) || API.getPlayerSubgroups(uuid).contains(group);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean playerAddGroup(String world, String player, String group) {
|
public boolean playerAddGroup(String world, String player, String group) {
|
||||||
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
if (useOnlySubgroups) {
|
if (useOnlySubgroups) {
|
||||||
return API.addPlayerSubgroup(player, group);
|
return API.addPlayerSubgroup(uuid, group);
|
||||||
} else {
|
} else {
|
||||||
if ("default".equalsIgnoreCase(API.getPlayerGroup(player))) {
|
if ("default".equalsIgnoreCase(API.getPlayerGroup(uuid))) {
|
||||||
return API.setPlayerGroup(player, group);
|
return API.setPlayerGroup(uuid, group);
|
||||||
} else {
|
} else {
|
||||||
return API.addPlayerSubgroup(player, group);
|
return API.addPlayerSubgroup(uuid, group);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean playerRemoveGroup(String world, String player, String group) {
|
public boolean playerRemoveGroup(String world, String player, String group) {
|
||||||
|
UUID uuid = API.getUUIDFromName(name);
|
||||||
if (useOnlySubgroups) {
|
if (useOnlySubgroups) {
|
||||||
return API.removePlayerSubgroup(player, group);
|
return API.removePlayerSubgroup(uuid, group);
|
||||||
} else {
|
} else {
|
||||||
if (group.equalsIgnoreCase(API.getPlayerGroup(player))) {
|
if (group.equalsIgnoreCase(API.getPlayerGroup(uuid))) {
|
||||||
return API.setPlayerGroup(player, "default");
|
return API.setPlayerGroup(uuid, "default");
|
||||||
} else {
|
} else {
|
||||||
return API.removePlayerSubgroup(player, group);
|
return API.removePlayerSubgroup(uuid, group);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getPlayerGroups(String world, String player) {
|
public String[] getPlayerGroups(String world, String player) {
|
||||||
ArrayList<String> array = API.getPlayerSubgroups(player);
|
UUID uuid = plugin.getServer().getPlayer(player).getUniqueId();
|
||||||
array.add(API.getPlayerGroup(player));
|
ArrayList<String> array = API.getPlayerSubgroups(uuid);
|
||||||
|
array.add(API.getPlayerGroup(uuid));
|
||||||
return array.toArray(new String[0]);
|
return array.toArray(new String[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getPrimaryGroup(String world, String player) {
|
public String getPrimaryGroup(String world, String player) {
|
||||||
return API.getPlayerGroup(player);
|
UUID uuid = plugin.getServer().getPlayer(player).getUniqueId();
|
||||||
|
return API.getPlayerGroup(uuid);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue