Don't send null packets.

cnaude · Dec 10, 2014 · bc7a27f · bc7a27f
1 parent a6cced4
commit bc7a27f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -70,9 +70,11 @@ public void addToTabList(String name, PurpleBot ircBot, Channel channel) {
         }
         try {
             PacketContainer packet = tabPacket(name, true);
-            for (Player reciever : plugin.getServer().getOnlinePlayers()) {
-                if (reciever.hasPermission("irc.tablist")) {
-                    protocolManager.sendServerPacket(reciever, packet);
+            if (packet != null) {
+                for (Player reciever : plugin.getServer().getOnlinePlayers()) {
+                    if (reciever.hasPermission("irc.tablist")) {
+                        protocolManager.sendServerPacket(reciever, packet);
+                    }
                 }
             }
         } catch (FieldAccessException | InvocationTargetException e) {
@@ -90,9 +92,11 @@ public void remFromTabList(String name) {
         }
         try {
             PacketContainer packet = tabPacket(name, false);
-            for (Player reciever : plugin.getServer().getOnlinePlayers()) {
-                if (reciever.hasPermission("irc.tablist")) {
-                    protocolManager.sendServerPacket(reciever, packet);
+            if (packet != null) {
+                for (Player reciever : plugin.getServer().getOnlinePlayers()) {
+                    if (reciever.hasPermission("irc.tablist")) {
+                        protocolManager.sendServerPacket(reciever, packet);
+                    }
                 }
             }
         } catch (FieldAccessException | InvocationTargetException e) {
@@ -114,7 +118,7 @@ private PacketContainer tabPacket(String name, boolean add) {
                 packet.getIntegers().write(2, 0);
                 packet.getStrings().write(0, displayName);
             } catch (Exception ex) {
-                plugin.logError("tabPacket: " + ex.getMessage());                
+                plugin.logError("tabPacket: " + ex.getMessage());
             }
         } else {
             plugin.logDebug("tabPacket: deprecated ");