Skip to content

Fix multiple bugs in chat plugin integrations and Vault #948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Smorki wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −7
Open

Fix multiple bugs in chat plugin integrations and Vault #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/net/milkbowl/vault/Vault.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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<Permission> 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<String>() {
@Override
public String call() {
Expand Down
2 changes: 1 addition & 1 deletion src/net/milkbowl/vault/chat/plugins/Chat_OverPermissions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/net/milkbowl/vault/chat/plugins/Chat_PermissionsEx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

Expand All @@ -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;
Expand All @@ -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);
}
}
Expand Down