Extra debugging...

cnaude · Dec 15, 2014 · 6d6fec2 · 6d6fec2
1 parent 4d59de6
commit 6d6fec2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -608,42 +608,57 @@ public String playerTokenizer(Player player, String message) {
     private String playerTokenizer(String playerName, String message) {
         plugin.logDebug("Tokenizing " + playerName);
         String worldName = plugin.defaultPlayerWorld;
+        plugin.logDebug("playerTokenizer: 1 ");
         String pSuffix = plugin.getPlayerSuffix(worldName, playerName);
+        plugin.logDebug("playerTokenizer: 2 ");
         String pPrefix = plugin.getPlayerPrefix(worldName, playerName);
+        plugin.logDebug("playerTokenizer: 3 ");
         String gPrefix = plugin.getGroupPrefix(worldName, playerName);
+        plugin.logDebug("playerTokenizer: 4 ");
         String gSuffix = plugin.getGroupSuffix(worldName, playerName);
+        plugin.logDebug("playerTokenizer: 5 ");
         String group = plugin.getPlayerGroup(worldName, playerName);
+        plugin.logDebug("playerTokenizer: 6 ");
         String displayName = plugin.getDisplayName(playerName);
+        plugin.logDebug("playerTokenizer: 7 ");
         String worldAlias = "";
         String worldColor = "";
         String jobShort = "";
         String job = "";
+        plugin.logDebug("playerTokenizer: 8 ");
         if (!worldName.isEmpty()) {
             worldAlias = plugin.getWorldAlias(worldName);
             worldColor = plugin.getWorldColor(worldName);
         }
+        plugin.logDebug("playerTokenizer: 9 ");
         if (pSuffix == null) {
             pSuffix = plugin.defaultPlayerSuffix;
         }
+        plugin.logDebug("playerTokenizer: 10 ");
         if (pPrefix == null) {
             pPrefix = plugin.defaultPlayerPrefix;
         }
+        plugin.logDebug("playerTokenizer: 11 ");
         if (gSuffix == null) {
             gSuffix = plugin.defaultGroupSuffix;
         }
+        plugin.logDebug("playerTokenizer: 12 ");
         if (gPrefix == null) {
             gPrefix = plugin.defaultGroupPrefix;
         }
+        plugin.logDebug("playerTokenizer: 13 ");
         if (group == null) {
             group = plugin.defaultPlayerGroup;
         }
+        plugin.logDebug("playerTokenizer: 14 ");
         Player player = getPlayer(playerName);
         if (player != null) {
             if (plugin.jobsHook != null) {
                 job = plugin.jobsHook.getPlayerJob(player, false);
                 jobShort = plugin.jobsHook.getPlayerJob(player, true);
             }
         }
+        plugin.logDebug("playerTokenizer: 15 ");
         if (player != null) {
             if (plugin.jobsHookOld != null) {
                 job = plugin.jobsHookOld.getPlayerJob(player, false);

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -109,7 +109,7 @@ private PacketContainer tabPacket(String name, boolean add) {
         PacketContainer packet = null;
         String version = plugin.getServer().getVersion();
         plugin.logDebug("tabPacket: " + version);
-        if (version.contains("MC: 1.7.10") || version.contains("MC: 1.8")) {
+        if (version.contains("MC: 1.7.10")) {
             try {
                 packet = protocolManager.createPacket(PacketType.Play.Server.PLAYER_INFO);
                 packet.getIntegers().write(0, (add ? 0 : 4));
@@ -120,6 +120,15 @@ private PacketContainer tabPacket(String name, boolean add) {
             } catch (Exception ex) {
                 plugin.logError("tabPacket: " + ex.getMessage());
             }
+        } else if (version.contains("MC: 1.8")) {
+            try {
+                packet = protocolManager.createPacket(PacketType.Play.Server.PLAYER_INFO);
+
+
+            } catch (Exception ex) {
+                plugin.logError("tabPacket: " + ex.getMessage());
+                ex.printStackTrace();
+            }
         } else {
             plugin.logDebug("tabPacket: deprecated ");
             playerListConstructor = protocolManager.createPacketConstructor(Packets.Server.PLAYER_INFO, "", false, (int) 0);