Add support for Jobs 2.12.0

cnaude · Oct 17, 2014 · 64b5428 · 64b5428
1 parent f0e4126
commit 64b5428
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/Hooks/JobsHook.java b/src/main/java/com/cnaude/purpleirc/Hooks/JobsHook.java
@@ -24,12 +24,7 @@ public JobsHook(PurpleIRC plugin) {
         this.plugin = plugin;
     }
 
-    public String getPlayerJob(Player player, boolean shortName) {
-        return getPlayerJob(player.getName(), shortName);
-    }
-
-    public String getPlayerJob(String playerName, boolean shortName) {
-        Player player = plugin.getServer().getPlayer(playerName);
+    public String getPlayerJob(Player player, boolean shortName) {       
         if (player != null) {
             ArrayList<String> j = new ArrayList<>();
             if (plugin.isPluginEnabled("Jobs")) {

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -39,11 +39,11 @@ public ChatTokenizer(PurpleIRC plugin) {
      * @return
      */
     public String chatIRCTokenizer(PurpleBot ircBot, User user, org.pircbotx.Channel channel, String template) {
-        return plugin.colorConverter.ircColorsToGame(ircUserTokenizer(template, user)             
+        return plugin.colorConverter.ircColorsToGame(ircUserTokenizer(template, user)
                 .replace("%NICKPREFIX%", ircBot.getNickPrefix(user, channel))
                 .replace("%CHANNEL%", channel.getName()));
     }
-    
+
     public String ircUserTokenizer(String template, User user) {
         String host = user.getHostmask();
         String server = user.getServer();
@@ -63,7 +63,7 @@ public String ircUserTokenizer(String template, User user) {
                 .replace("%SERVER%", server)
                 .replace("%AWAY%", away);
     }
-    
+
     public String ircUserTokenizer(String template, User recipient, User kicker) {
         String host = kicker.getHostmask();
         String server = kicker.getServer();
@@ -617,9 +617,12 @@ private String playerTokenizer(String player, String message) {
         if (group == null) {
             group = plugin.defaultPlayerGroup;
         }
-        if (plugin.jobsHook != null) {
-            job = plugin.jobsHook.getPlayerJob(player, false);
-            jobShort = plugin.jobsHook.getPlayerJob(player, true);
+        Player playerO = plugin.getServer().getPlayer(player);
+        if (playerO != null) {
+            if (plugin.jobsHook != null) {
+                job = plugin.jobsHook.getPlayerJob(playerO, false);
+                jobShort = plugin.jobsHook.getPlayerJob(playerO, true);
+            }
         }
         plugin.logDebug("[S]Raw message: " + message);
         return message.replace("%DISPLAYNAME%", displayName)