Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup formatting.

Browse Source
This commit is contained in:
Wizjany 2011-09-27 03:32:46 -04:00
parent 4f80e78a7e
commit 2d7c462477
10 changed files with 141 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/sk89q/bukkit/migration/ConfigurationPermissionsResolver.java
View File

@ -44,6 +44,7 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
config.setProperty("permissions.groups.admins.permissions", new String[]{"*"}); config.setProperty("permissions.groups.admins.permissions", new String[]{"*"});
config.setProperty("permissions.users.sk89q.permissions", new String[]{"worldedit.*"}); config.setProperty("permissions.users.sk89q.permissions", new String[]{"worldedit.*"});
config.setProperty("permissions.users.sk89q.groups", new String[]{"admins"}); config.setProperty("permissions.users.sk89q.groups", new String[]{"admins"});
} }
public void load() { public void load() {

1
src/main/java/com/sk89q/bukkit/migration/DinnerPermsResolver.java
View File

@ -98,5 +98,4 @@ public class DinnerPermsResolver implements PermissionsResolver {
return "Using the Bukkit Permissions API."; return "Using the Bukkit Permissions API.";
} }
} }

7
src/main/java/com/sk89q/bukkit/migration/NijiPermissionsResolver.java
View File

@ -88,7 +88,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
} }
} }
@SuppressWarnings({ "static-access" }) @SuppressWarnings("static-access")
public boolean inGroup(String name, String group) { public boolean inGroup(String name, String group) {
try { try {
Player player = server.getPlayer(name); Player player = server.getPlayer(name);
@ -104,7 +104,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
} }
} }
@SuppressWarnings({ "static-access" }) @SuppressWarnings("static-access")
public String[] getGroups(String name) { public String[] getGroups(String name) {
try { try {
Player player = server.getPlayer(name); Player player = server.getPlayer(name);
@ -114,8 +114,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
groups = api.getHandler().getGroups(player.getWorld().getName(), player.getName()); groups = api.getHandler().getGroups(player.getWorld().getName(), player.getName());
} catch (Throwable t) { } catch (Throwable t) {
String group = api.Security.getGroup(player.getWorld().getName(), player.getName()); String group = api.Security.getGroup(player.getWorld().getName(), player.getName());
if (group != null) if (group != null) groups = new String[] { group };
groups = new String[] {group};
} }
if (groups == null) { if (groups == null) {
return new String[0]; return new String[0];

1
src/main/java/com/sk89q/bukkit/migration/PermissionsResolverManager.java
View File

@ -156,7 +156,6 @@ public class PermissionsResolverManager implements PermissionsResolver {
config.setProperty("ignore-nijiperms-bridges", true); config.setProperty("ignore-nijiperms-bridges", true);
isUpdated = true; isUpdated = true;
} }
if (keys.contains("dinner-perms")) { if (keys.contains("dinner-perms")) {
config.removeProperty("dinner-perms"); config.removeProperty("dinner-perms");
isUpdated = true; isUpdated = true;

1
src/main/java/com/sk89q/bukkit/migration/PermissionsResolverServerListener.java
View File

@ -82,5 +82,4 @@ public class PermissionsResolverServerListener extends ServerListener {
manager.setServerListener(this); manager.setServerListener(this);
} }
} }