Mirrors/FastAsyncWorldEdit
3
0
Fork 1
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-20 01:40:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

WEPIF: Use UUIDs wherever possible in PermissionsExResolver

Quellcode durchsuchen
Dieser Commit ist enthalten in:
zml 2015-01-10 16:57:53 -08:00
Ursprung bb2c5ba003
Commit 6a6c590a07
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 75EFC1F079F6665E
2 geänderte Dateien mit 7 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
worldedit-bukkit/build.gradle
Datei anzeigen

@ -3,9 +3,9 @@ apply plugin: 'idea'
dependencies { dependencies {
compile project(':worldedit-core') compile project(':worldedit-core')
compile 'com.sk89q:dummypermscompat:1.7' compile 'com.sk89q:dummypermscompat:1.8'
compile 'org.sk89q.bukkit:bukkit-classloader-check:1.7.2-R0.3' compile 'org.sk89q.bukkit:bukkit-classloader-check:1.7.9-R0.2'
compile 'org.bukkit:bukkit:1.7.2-R0.3' compile 'org.bukkit:bukkit:1.7.9-R0.2'
testCompile 'org.mockito:mockito-core:1.9.0-rc1' testCompile 'org.mockito:mockito-core:1.9.0-rc1'
} }

8
worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsExResolver.java
Datei anzeigen

@ -57,7 +57,7 @@ public class PermissionsExResolver extends DinnerPermsResolver {
public boolean hasPermission(OfflinePlayer player, String permission) { public boolean hasPermission(OfflinePlayer player, String permission) {
Permissible permissible = getPermissible(player); Permissible permissible = getPermissible(player);
if (permissible == null) { if (permissible == null) {
return manager.has(player.getName(), permission, null); return manager.has(player.getUniqueId(), permission, null);
} else { } else {
return permissible.hasPermission(permission); return permissible.hasPermission(permission);
} }
@ -65,18 +65,18 @@ public class PermissionsExResolver extends DinnerPermsResolver {
@Override @Override
public boolean hasPermission(String worldName, OfflinePlayer player, String permission) { public boolean hasPermission(String worldName, OfflinePlayer player, String permission) {
return hasPermission(worldName, player.getName(), permission); return manager.has(player.getUniqueId(), permission, worldName);
} }
@Override @Override
public boolean inGroup(OfflinePlayer player, String group) { public boolean inGroup(OfflinePlayer player, String group) {
return super.inGroup(player, group) || manager.getUser(player.getName()).inGroup(group); return super.inGroup(player, group) || manager.getUser(player.getUniqueId()).inGroup(group);
} }
@Override @Override
public String[] getGroups(OfflinePlayer player) { public String[] getGroups(OfflinePlayer player) {
if (getPermissible(player) == null) { if (getPermissible(player) == null) {
PermissionUser user = manager.getUser(player.getName()); PermissionUser user = manager.getUser(player.getUniqueId());
if (user == null) { if (user == null) {
return new String[0]; return new String[0];
} }