Check for null when running ReportRTS command from console.

cnaude · Apr 30, 2014 · f993734 · f993734
1 parent b297559
commit f993734
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.cnaude</groupId>
     <artifactId>PurpleIRC</artifactId>
-    <version>2.1.13</version>
+    <version>2.1.14-SNAPSHOT</version>
     <name>PurpleIRC</name>
     <description>A CraftBukkit plugin for bridging game chat with IRC. Connect to any number of IRC servers and channels simultaneously.</description>
     <url>http://dev.bukkit.org/server-mods/purpleirc/</url>

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -423,7 +423,12 @@ public String reportRTSTokenizer(String pName, String template, HelpRequest requ
         if (modName == null) {
             modName = "";
         } else {
-            displayModName = this.getPlayer(modName).getDisplayName();
+            Player player = this.getPlayer(modName);
+            if (player != null) {
+                displayModName = player.getDisplayName();
+            } else {
+                displayModName = modName;
+            }
         }
         if (name == null) {
             name = "";