Remove deprecated Vault methods.

cnaude · Dec 17, 2014 · 2ca9f3e · 2ca9f3e
1 parent 6d6fec2
commit 2ca9f3e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -79,6 +79,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -997,7 +998,14 @@ public String getPlayerSuffix(String worldName, String player) {
         String suffix = "";
         if (vaultHelpers != null) {
             if (vaultHelpers.chat != null) {
-                suffix = vaultHelpers.chat.getPlayerSuffix(worldName, player);
+                OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(player);
+                if (offlinePlayer != null) {
+                    try {
+                        suffix = vaultHelpers.chat.getPlayerSuffix(worldName, offlinePlayer);
+                    } catch (Exception ex) {
+                        logDebug("getPlayerSuffix (" + player + "): " + ex.getMessage());
+                    }
+                }
             }
         }
         if (suffix == null) {
@@ -1061,7 +1069,7 @@ public String getGroupPrefix(Player player) {
                 try {
                     group = vaultHelpers.permission.getPrimaryGroup(player);
                 } catch (Exception ex) {
-                    logDebug("Problem with primary group (" + player.getName() + "): " + ex.getMessage());
+                    logDebug("getGroupPrefix (" + player.getName() + "): " + ex.getMessage());
                 }
                 if (group == null) {
                     group = "";
@@ -1086,10 +1094,13 @@ public String getGroupPrefix(String worldName, String player) {
         if (vaultHelpers != null) {
             if (vaultHelpers.chat != null) {
                 String group = "";
-                try {
-                    group = vaultHelpers.permission.getPrimaryGroup(worldName, player);
-                } catch (Exception ex) {
-                    logDebug("Problem with primary group (" + player + "): " + ex.getMessage());
+                OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(player);
+                if (offlinePlayer != null) {
+                    try {
+                        group = vaultHelpers.permission.getPrimaryGroup(worldName, offlinePlayer);
+                    } catch (Exception ex) {
+                        logDebug("getGroupPrefix (" + player + "): " + ex.getMessage());
+                    }
                 }
                 if (group == null) {
                     group = "";

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -123,7 +123,7 @@ private PacketContainer tabPacket(String name, boolean add) {
         } else if (version.contains("MC: 1.8")) {
             try {
                 packet = protocolManager.createPacket(PacketType.Play.Server.PLAYER_INFO);
-
+                //packet.getChatComponents()
 
             } catch (Exception ex) {
                 plugin.logError("tabPacket: " + ex.getMessage());