Upstream
/
PurpleIRC-spigot
mirror of https://github.com/cnaude/PurpleIRC-spigot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better error handling with vault group prefix lookup.

This commit is contained in:
cnaude 2019-04-10 21:30:54 -07:00
parent 68a282690a
commit 0db1b2e9cd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -215,7 +215,7 @@
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.6</version>
<version>1.7</version>
<scope>provided</scope>
<exclusions>
<exclusion>

22
src/main/java/com/cnaude/purpleirc/PurpleIRC.java
View File

@ -1271,19 +1271,19 @@ public class PurpleIRC extends JavaPlugin {
*/
public String getGroupPrefix(Player player) {
String prefix = "";
if (vaultHelpers != null) {
if (vaultHelpers.chat != null && vaultHelpers.permission != null) {
String group = "";
try {
group = vaultHelpers.permission.getPrimaryGroup(player);
} catch (Exception ex) {
logDebug("getGroupPrefix (" + player.getName() + "): " + ex.getMessage());
try {
if (vaultHelpers != null) {
if (vaultHelpers.chat != null && vaultHelpers.permission != null) {
String group = vaultHelpers.permission.getPrimaryGroup(player);
if (group == null) {
group = "";
}
prefix = vaultHelpers.chat.getGroupPrefix(player.getLocation().getWorld(), group);
}
if (group == null) {
group = "";
}
prefix = vaultHelpers.chat.getGroupPrefix(player.getLocation().getWorld(), group);
}
} catch (Exception ex) {
logDebug("getGroupPrefix (" + player.getName() + "): " + ex.getMessage());
return "";
}
if (prefix == null) {
prefix = "";