Upstream
/
Vault
mirror of https://github.com/MilkBowl/Vault.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove deprecated method calls from older permission systems.

This commit is contained in:
Sleaker 2018-09-10 22:21:35 -07:00
parent 94d0a45218
commit e05bdf17da
4 changed files with 589 additions and 689 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java
View File

@ -332,46 +332,6 @@ public class Permission_GroupManager extends Permission {
return handler.getGroup(playerName);
}
@Override
public boolean playerAddTransient(String world, String player, String permission) {
if (world != null) {
throw new UnsupportedOperationException(getName() + " does not support World based transient permissions!");
}
Player p = plugin.getServer().getPlayer(player);
if (p == null) {
throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!");
}
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment().getPlugin().equals(plugin)) {
paInfo.getAttachment().setPermission(permission, true);
return true;
}
}
PermissionAttachment attach = p.addAttachment(plugin);
attach.setPermission(permission, true);
return true;
}
@Override
public boolean playerRemoveTransient(String world, String player, String permission) {
if (world != null) {
throw new UnsupportedOperationException(getName() + " does not support World based transient permissions!");
}
Player p = plugin.getServer().getPlayer(player);
if (p == null) {
throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!");
}
for (PermissionAttachmentInfo paInfo : p.getEffectivePermissions()) {
if (paInfo.getAttachment().getPlugin().equals(plugin)) {
return paInfo.getAttachment().getPermissions().remove(permission);
}
}
return false;
}
@Override
public String[] getGroups() {
Set<String> groupNames = new HashSet<String>();

18
src/net/milkbowl/vault/permission/plugins/Permission_OverPermissions.java
View File

@ -171,24 +171,6 @@ public class Permission_OverPermissions extends Permission {
return playerGroups[0];
}
@Override
public boolean playerAddTransient(String world, String playerName, String permission) {
if (!userManager.doesUserExist(playerName)) { // Can't add transient permissions to an offline player.
return false;
}
PermissionUser user = userManager.getPermissionUser(playerName);
return (world == null) ? user.addGlobalTransientPermissionNode(permission) : user.addTransientPermissionNode(permission, world);
}
@Override
public boolean playerRemoveTransient(String world, String playerName, String permission) {
if (!userManager.doesUserExist(playerName)) {
return false;
}
PermissionUser user = userManager.getPermissionUser(playerName);
return (world == null) ? user.removeGlobalTransientPermissionNode(permission) : user.removeTransientPermissionNode(permission, world);
}
@Override
public String[] getGroups( ) {
ArrayList<String> groupNames = new ArrayList<String>();

16
src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java
View File

@ -224,12 +224,6 @@ public class Permission_Permissions3 extends Permission {
return this.perms.has(worldName, playerName, permission);
}
@Override
public boolean playerAddTransient(String player, String permission) {
return playerAddTransient(null, player, permission);
}
@Override
public boolean playerAddTransient(Player player, String permission) {
return playerAddTransient(null, player.getName(), permission);
@ -240,8 +234,7 @@ public class Permission_Permissions3 extends Permission {
return playerAddTransient(worldName, player.getName(), permission);
}
@Override
public boolean playerAddTransient(String worldName, String player, String permission) {
private boolean playerAddTransient(String worldName, String player, String permission) {
if (worldName == null) {
worldName = "*";
}
@ -253,10 +246,6 @@ public class Permission_Permissions3 extends Permission {
}
}
@Override
public boolean playerRemoveTransient(String player, String permission) {
return playerRemoveTransient(null, player, permission);
}
@Override
public boolean playerRemoveTransient(Player player, String permission) {
@ -268,8 +257,7 @@ public class Permission_Permissions3 extends Permission {
return playerRemoveTransient(worldName, player.getName(), permission);
}
@Override
public boolean playerRemoveTransient(String worldName, String player, String permission) {
private boolean playerRemoveTransient(String worldName, String player, String permission) {
if (worldName == null) {
worldName = "*";
}

30
src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java
View File

@ -303,16 +303,6 @@ public class Permission_PermissionsEx extends Permission {
}
}
@Override
public boolean playerAddTransient(String worldName, String player, String permission) {
PermissionUser pPlayer = getUser(player);
if (pPlayer != null) {
pPlayer.addTimedPermission(permission, worldName, 0);
return true;
} else {
return false;
}
}
@Override
public boolean playerAddTransient(String worldName, Player player, String permission) {
@ -325,26 +315,11 @@ public class Permission_PermissionsEx extends Permission {
}
}
@Override
public boolean playerAddTransient(String player, String permission) {
return playerAddTransient(null, player, permission);
}
@Override
public boolean playerAddTransient(Player player, String permission) {
return playerAddTransient(null, player, permission);
}
@Override
public boolean playerRemoveTransient(String worldName, String player, String permission) {
PermissionUser pPlayer = getUser(player);
if (pPlayer != null) {
pPlayer.removeTimedPermission(permission, worldName);
return true;
} else {
return false;
}
}
@Override
public boolean playerRemoveTransient(Player player, String permission) {
@ -362,11 +337,6 @@ public class Permission_PermissionsEx extends Permission {
}
}
@Override
public boolean playerRemoveTransient(String player, String permission) {
return playerRemoveTransient(null, player, permission);
}
@Override
public String[] getGroups() {
List<PermissionGroup> groups = PermissionsEx.getPermissionManager().getGroupList();