Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reworked chat completely. Added Herochat integration. New tag-parsing system. Non-monitor-breaking relation colored chat.

Browse Source
This commit is contained in:
Olof Larsson
2012-05-02 04:45:10 +02:00
parent 06d22549e2
commit 1459c9c057
14 changed files with 316 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/massivecraft/factions/P.java
View File

@@ -24,6 +24,7 @@ import com.massivecraft.factions.cmd.*;
import com.massivecraft.factions.integration.capi.CapiFeatures;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.EssentialsFeatures;
import com.massivecraft.factions.integration.HerochatFeatures;
import com.massivecraft.factions.integration.LWCFeatures;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.integration.Worldguard;
@@ -34,7 +35,6 @@ import com.massivecraft.factions.listeners.FactionsExploitListener;
import com.massivecraft.factions.listeners.FactionsHealthBarListener;
import com.massivecraft.factions.listeners.FactionsPlayerListener;
import com.massivecraft.factions.listeners.FactionsServerListener;
import com.massivecraft.factions.struct.ChatMode;
import com.massivecraft.factions.struct.FFlag;
import com.massivecraft.factions.struct.FPerm;
import com.massivecraft.factions.struct.Rel;
@@ -105,6 +105,7 @@ public class P extends MPlugin
SpoutFeatures.setup();
Econ.setup();
CapiFeatures.setup();
HerochatFeatures.setup();
LWCFeatures.setup();
if(Conf.worldGuardChecking)
@@ -241,13 +242,12 @@ public class P extends MPlugin
// Does player have Faction Chat enabled? If so, chat plugins should preferably not do channels,
// local chat, or anything else which targets individual recipients, so Faction Chat can be done
/**
* @deprecated As of release 1.8, there is no built in faction chat.
*/
public boolean isPlayerFactionChatting(Player player)
{
if (player == null) return false;
FPlayer me = FPlayers.i.get(player);
if (me == null)return false;
return me.getChatMode().isAtLeast(ChatMode.ALLIANCE);
return false;
}
// Is this chat message actually a Factions command, and thus should be left alone by other plugins?
@@ -276,7 +276,7 @@ public class P extends MPlugin
return tag;
// if listener isn't set, or config option is disabled, give back uncolored tag
if (listener == null || !Conf.chatTagRelationColored) {
if (listener == null || !Conf.chatParseTagsColored) {
tag = me.getChatTag().trim();
} else {
FPlayer you = FPlayers.i.get(listener);