From abb7b759204f1f8feca96d108f77dc6393a721ea Mon Sep 17 00:00:00 2001
From: cnaude <cnaude@zebra>
Date: Sat, 24 Jan 2015 09:32:22 -0700
Subject: [PATCH] Check for null uuid before attempting to get offline player.
 #2

---
 dependency-reduced-pom.xml                        | 4 ++--
 pom.xml                                           | 4 +---
 src/main/java/com/cnaude/purpleirc/PurpleIRC.java | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 66ea3b7..1264ed7 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -140,8 +140,8 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>15.0</version>
-      <scope>provided</scope>
+      <version>17.0</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.cnaude.essentials</groupId>
diff --git a/pom.xml b/pom.xml
index e1efda9..d665e66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,9 +89,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>15.0</version>
-            <type>jar</type>
-            <scope>provided</scope>
+            <version>17.0</version>
         </dependency>
         
         <!-- Essentials -->
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
index bf7ca1a..d308ec4 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -1195,7 +1195,7 @@ public class PurpleIRC extends JavaPlugin {
     public String getGroupPrefix(String worldName, String player) {
         String prefix = "";
         UUID uuid = getPlayerUuid(player);
-        if (vaultHelpers != null) {
+        if (vaultHelpers != null && uuid != null) {
             if (vaultHelpers.chat != null) {
                 String group = "";
                 OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(uuid);
@@ -1381,7 +1381,7 @@ public class PurpleIRC extends JavaPlugin {
             logError(e.getMessage());
         }
     }
-   
+
     public String getPlayerHost(final String playerIP) {
         if (playerIP == null) {
             return "unknown";