Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-09 22:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagate FAWE diff annotations down the bukkit module

Browse Source 
- Minor upstream merge
This commit is contained in:
NotMyFault
2021-07-14 14:40:20 +02:00
parent d7763c8542
commit bcceadee6b
34 changed files with 450 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-bukkit/src/main/java/com/sk89q/wepif/DinnerPermsResolver.java
View File

@ -48,21 +48,25 @@ public class DinnerPermsResolver implements PermissionsResolver {
}
@Override
@SuppressWarnings("deprecation")
public boolean hasPermission(String name, String permission) {
return hasPermission(server.getOfflinePlayer(name), permission);
}
@Override
@SuppressWarnings("deprecation")
public boolean hasPermission(String worldName, String name, String permission) {
return hasPermission(worldName, server.getOfflinePlayer(name), permission);
}
@Override
@SuppressWarnings("deprecation")
public boolean inGroup(String name, String group) {
return inGroup(server.getOfflinePlayer(name), group);
}
@Override
@SuppressWarnings("deprecation")
public String[] getGroups(String name) {
return getGroups(server.getOfflinePlayer(name));
}

11
worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java
View File

@ -72,7 +72,6 @@ public class NijiPermissionsResolver implements PermissionsResolver {
}
@Override
@SuppressWarnings("static-access")
public boolean hasPermission(String name, String permission) {
try {
Player player = server.getPlayerExact(name);
@ -82,7 +81,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
try {
return api.getHandler().has(player, permission);
} catch (Throwable t) {
return api.Security.permission(player, permission);
return Permissions.Security.permission(player, permission);
}
} catch (Throwable t) {
LOGGER.warn("Failed to check permissions", t);
@ -105,7 +104,6 @@ public class NijiPermissionsResolver implements PermissionsResolver {
}
@Override
@SuppressWarnings("static-access")
public boolean inGroup(String name, String group) {
try {
Player player = server.getPlayerExact(name);
@ -115,7 +113,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
try {
return api.getHandler().inGroup(player.getWorld().getName(), name, group);
} catch (Throwable t) {
return api.Security.inGroup(name, group);
return Permissions.Security.inGroup(name, group);
}
} catch (Throwable t) {
LOGGER.warn("Failed to check groups", t);
@ -124,7 +122,6 @@ public class NijiPermissionsResolver implements PermissionsResolver {
}
@Override
@SuppressWarnings("static-access")
public String[] getGroups(String name) {
try {
Player player = server.getPlayerExact(name);
@ -135,9 +132,9 @@ public class NijiPermissionsResolver implements PermissionsResolver {
try {
groups = api.getHandler().getGroups(player.getWorld().getName(), player.getName());
} catch (Throwable t) {
String group = api.Security.getGroup(player.getWorld().getName(), player.getName());
String group = Permissions.Security.getGroup(player.getWorld().getName(), player.getName());
if (group != null) {
groups = new String[]{group};
groups = new String[] { group };
}
}
if (groups == null) {

6
worldedit-bukkit/src/main/java/com/sk89q/wepif/VaultResolver.java
View File

@ -28,7 +28,9 @@ import org.bukkit.plugin.RegisteredServiceProvider;
public class VaultResolver implements PermissionsResolver {
//FAWE start - made public
public static Permission perms = null;
//FAWE end
public static PermissionsResolver factory(Server server, YAMLProcessor config) {
if (server.getPluginManager().getPlugin("Vault") == null) {
@ -62,21 +64,25 @@ public class VaultResolver implements PermissionsResolver {
}
@Override
@SuppressWarnings("deprecation")
public boolean hasPermission(String name, String permission) {
return hasPermission(server.getOfflinePlayer(name), permission);
}
@Override
@SuppressWarnings("deprecation")
public boolean hasPermission(String worldName, String name, String permission) {
return hasPermission(worldName, server.getOfflinePlayer(name), permission);
}
@Override
@SuppressWarnings("deprecation")
public boolean inGroup(String player, String group) {
return inGroup(server.getOfflinePlayer(player), group);
}
@Override
@SuppressWarnings("deprecation")
public String[] getGroups(String player) {
return getGroups(server.getOfflinePlayer(player));
}

3
worldedit-bukkit/src/main/java/com/sk89q/wepif/bPermissionsResolver.java
View File

@ -54,6 +54,7 @@ public class bPermissionsResolver implements PermissionsResolver {
}
@Override
@SuppressWarnings("deprecation")
public boolean hasPermission(String name, String permission) {
return hasPermission(server.getOfflinePlayer(name), permission);
}
@ -64,11 +65,13 @@ public class bPermissionsResolver implements PermissionsResolver {
}
@Override
@SuppressWarnings("deprecation")
public boolean inGroup(String player, String group) {
return inGroup(server.getOfflinePlayer(player), group);
}
@Override
@SuppressWarnings("deprecation")
public String[] getGroups(String player) {
return getGroups(server.getOfflinePlayer(player));
}