From 0db1b2e9cd971e5d566cbe73396174dea8d7a9ff Mon Sep 17 00:00:00 2001
From: cnaude <cnaude@zebra.lan>
Date: Wed, 10 Apr 2019 21:30:54 -0700
Subject: [PATCH] Better error handling with vault group prefix lookup.

---
 pom.xml                                       |  2 +-
 .../java/com/cnaude/purpleirc/PurpleIRC.java  | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 282a8df..e1193e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
index 54b1018..9d4c28a 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -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 = "";