Add ignore-chat-cancel option

cnaude · May 20, 2014 · 4c69c29 · 4c69c29
1 parent 13a596d
commit 4c69c29
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -128,6 +128,8 @@
             <version>2.11.4</version>
         </dependency>
 
+        <!-- Old Factions -->
+
         <!-- Factions -->
         <dependency>
             <groupId>com.massivecraft</groupId>

diff --git a/src/main/java/com/cnaude/purpleirc/ChannelWatcher.java b/src/main/java/com/cnaude/purpleirc/ChannelWatcher.java
@@ -1,7 +1,6 @@
 package com.cnaude.purpleirc;
 
 import org.bukkit.scheduler.BukkitTask;
-import org.pircbotx.Channel;
 
 /**
  *

diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java
@@ -37,7 +37,7 @@ public void onAsyncPlayerChat(AsyncPlayerChatEvent event) {
             return;
         }
         event.setMessage(message.replace("[[townytag]]", ""));
-        if (event.isCancelled() && !plugin.isPluginEnabled("FactionChat")) {
+        if (event.isCancelled() && !plugin.isPluginEnabled("FactionChat") && !plugin.ignoreChatCancel) {
             plugin.logDebug("Ignore chat message due to event cancellation: " + event.getMessage());
             return;
         }

diff --git a/src/main/java/com/cnaude/purpleirc/Hooks/FactionChatHook.java b/src/main/java/com/cnaude/purpleirc/Hooks/FactionChatHook.java
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.cnaude.purpleirc.Hooks;
 
 import com.cnaude.purpleirc.PurpleIRC;
@@ -31,6 +27,7 @@ public FactionChatHook(PurpleIRC plugin) {
      */
     public String getChatMode(Player player) {
         String playerChatMode = null;
+
         try {
             playerChatMode = FactionChatAPI.getChatMode(player);
             plugin.logDebug("fcHook => [CM: " + playerChatMode + "] [" + player.getName() + "]");

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -116,6 +116,7 @@ public class PurpleIRC extends JavaPlugin {
     private boolean customTabList;
     private boolean listSortByName;
     public boolean exactNickMatch;
+    public boolean ignoreChatCancel;
     public Long ircConnCheckInterval;
     public Long ircChannelCheckInterval;
     public ChannelWatcher channelWatcher;
@@ -523,6 +524,7 @@ private void loadConfig() {
         stripIRCColors = getConfig().getBoolean("strip-irc-colors", false);
         stripIRCBackgroundColors = getConfig().getBoolean("strip-irc-bg-colors", true);
         exactNickMatch = getConfig().getBoolean("nick-exact-match", true);
+        ignoreChatCancel = getConfig().getBoolean("ignore-chat-cancel", false);
         colorConverter = new ColorConverter(this, stripGameColors, stripIRCColors, stripIRCBackgroundColors);
         logDebug("strip-game-colors: " + stripGameColors);
         logDebug("strip-irc-colors: " + stripIRCColors);

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/RegexGlobber.java b/src/main/java/com/cnaude/purpleirc/Utilities/RegexGlobber.java
@@ -1,17 +1,12 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package com.cnaude.purpleirc.Utilities;
 
-/**
+/** http://stackoverflow.com/questions/1247772/is-there-an-equivalent-of-java-util-regex-for-glob-type-patterns
  *
  * @author cnaude
  */
-public class RegexGlobber {
-    //http://stackoverflow.com/questions/1247772/is-there-an-equivalent-of-java-util-regex-for-glob-type-patterns
+public class RegexGlobber {    
 
-    /**
+    /** 
      *
      * @param glob
      * @return

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -214,3 +214,5 @@ game-color-map:
     WHITE: WHITE
     YELLOW: YELLOW
 Debug: false
+# Ignore chat cancellation.
+ignore-chat-cancel: false