Properly enforce custom-tab-list option. #84

cnaude · Sep 22, 2014 · 8071556 · 8071556
1 parent 110ab16
commit 8071556
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,6 +36,7 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+
         <!-- Bukkit -->
         <repository>
             <id>bukkit-repo</id>

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -122,7 +122,7 @@ public class PurpleIRC extends JavaPlugin {
     private boolean stripGameColors;
     private boolean stripIRCColors;
     private boolean stripIRCBackgroundColors;
-    private boolean customTabList;
+    public boolean customTabList;
     private boolean listSortByName;
     public boolean exactNickMatch;
     public boolean ignoreChatCancel;

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -39,6 +39,9 @@ public NetPackets(PurpleIRC plugin) {
      * @param channel
      */
     public void addToTabList(String name, PurpleBot ircBot, Channel channel) {
+        if (! plugin.customTabList) {
+            return;
+        }
         String channelName = channel.getName();
         if (ircBot.tabIgnoreNicks.containsKey(channelName)) {
             if (ircBot.tabIgnoreNicks.get(channelName).contains(name)) {
@@ -56,9 +59,7 @@ public void addToTabList(String name, PurpleBot ircBot, Channel channel) {
                     protocolManager.sendServerPacket(reciever, packet);
                 }
             }
-        } catch (FieldAccessException e) {
-            plugin.logError(e.getMessage());
-        } catch (InvocationTargetException e) {
+        } catch (FieldAccessException | InvocationTargetException e) {
             plugin.logError(e.getMessage());
         }
     }
@@ -68,6 +69,9 @@ public void addToTabList(String name, PurpleBot ircBot, Channel channel) {
      * @param name
      */
     public void remFromTabList(String name) {
+        if (! plugin.customTabList) {
+            return;
+        }
         playerListConstructor = protocolManager.createPacketConstructor(Packets.Server.PLAYER_INFO, "", false, (int) 0);
         try {
             PacketContainer packet = playerListConstructor.createPacket(
@@ -77,9 +81,7 @@ public void remFromTabList(String name) {
                     protocolManager.sendServerPacket(reciever, packet);
                 }
             }
-        } catch (FieldAccessException e) {
-            plugin.logError(e.getMessage());
-        } catch (InvocationTargetException e) {
+        } catch (FieldAccessException | InvocationTargetException e) {
             plugin.logError(e.getMessage());
         }
     }