diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java index f085f0e5..77bef129 100644 --- a/src/net/milkbowl/vault/Vault.java +++ b/src/net/milkbowl/vault/Vault.java @@ -359,7 +359,7 @@ private void convertCommand(CommandSender sender, String[] args) { } } - sender.sendMessage("Converson complete, please verify the data before using it."); + sender.sendMessage("Conversion complete, please verify the data before using it."); } private void infoCommand(CommandSender sender) { @@ -480,7 +480,12 @@ public String call() { })); // Create our Permission Graph and Add our permission Plotters - final String permName = Bukkit.getServer().getServicesManager().getRegistration(Permission.class).getProvider().getName(); + RegisteredServiceProvider rspPerm = Bukkit.getServer().getServicesManager().getRegistration(Permission.class); + Permission perm = null; + if (rspPerm != null) { + perm = rspPerm.getProvider(); + } + final String permName = perm != null ? perm.getName() : "No Permission"; metrics.addCustomChart(new SimplePie("permission", new Callable() { @Override public String call() { diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java b/src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java index b3e572aa..b257b2f1 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java @@ -98,7 +98,7 @@ public String getGroupSuffix(String world, String group) { @Override public void setGroupSuffix(String world, String group, String suffix) { - setGroupInfoString(world, group, "prefix", suffix); + setGroupInfoString(world, group, "suffix", suffix); } @Override diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java b/src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java index faac2fe1..560eaa55 100644 --- a/src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java +++ b/src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java @@ -359,7 +359,7 @@ public void setPlayerPrefix(String world, String player, String prefix) { @Override public String getGroupPrefix(String world, String group) { PermissionGroup pGroup = PermissionsEx.getPermissionManager().getGroup(group); - if (group != null) { + if (pGroup != null) { return pGroup.getPrefix(world); } else { return null; @@ -369,7 +369,7 @@ public String getGroupPrefix(String world, String group) { @Override public void setGroupPrefix(String world, String group, String prefix) { PermissionGroup pGroup = PermissionsEx.getPermissionManager().getGroup(group); - if (group != null) { + if (pGroup != null) { pGroup.setPrefix(prefix, world); } @@ -378,7 +378,7 @@ public void setGroupPrefix(String world, String group, String prefix) { @Override public String getGroupSuffix(String world, String group) { PermissionGroup pGroup = PermissionsEx.getPermissionManager().getGroup(group); - if (group != null) { + if (pGroup != null) { return pGroup.getSuffix(world); } else { return null; @@ -388,7 +388,7 @@ public String getGroupSuffix(String world, String group) { @Override public void setGroupSuffix(String world, String group, String suffix) { PermissionGroup pGroup = PermissionsEx.getPermissionManager().getGroup(group); - if (group != null) { + if (pGroup != null) { pGroup.setSuffix(suffix, world); } }