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

Remove old Essentials chat integration features.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-09 13:02:40 +02:00
parent c88847bd3e
commit f119fbb6f6
3 changed files with 1 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/massivecraft/factions/Factions.java
View File

@ -9,7 +9,6 @@ import java.util.Set;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -236,35 +235,6 @@ public class Factions extends MPlugin
Conf.chatTagHandledByAnotherPlugin = notByFactions; Conf.chatTagHandledByAnotherPlugin = notByFactions;
} }
// Simply put, should this chat event be left for Factions to handle? For now, that means players with Faction Chat
// enabled or use of the Factions f command without a slash; combination of isPlayerFactionChatting() and isFactionsCommand()
public boolean shouldLetFactionsHandleThisChat(AsyncPlayerChatEvent event)
{
if (event == null) return false;
return (isPlayerFactionChatting(event.getPlayer()) || isFactionsCommand(event.getMessage()));
}
// 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)
{
return false;
}
// Is this chat message actually a Factions command, and thus should be left alone by other plugins?
/**
* @deprecated As of release 1.8.1 the normal Bukkit command-handling is used.
*/
public boolean isFactionsCommand(String check)
{
return false;
}
// Get a player's faction tag (faction name), mainly for usage by chat plugins for local/channel chat // Get a player's faction tag (faction name), mainly for usage by chat plugins for local/channel chat
public String getPlayerFactionTag(Player player) public String getPlayerFactionTag(Player player)
{ {

14
src/com/massivecraft/factions/integration/EssentialsFeatures.java
View File

@ -59,26 +59,14 @@ public class EssentialsFeatures
} }
catch (ClassNotFoundException ex) catch (ClassNotFoundException ex)
{ {
// no? try older Essentials 2.x integration method
try
{
EssentialsOldVersionFeatures.integrateChat(essChat);
}
catch (NoClassDefFoundError ex2) { /* no known integration method, then */ }
} }
} }
public static void unhookChat() public static void unhookChat()
{ {
if (essChat == null) return; if (essChat == null) return;
try
{
EssentialsOldVersionFeatures.unhookChat();
} }
catch (NoClassDefFoundError ex) {}
}
// return false if feature is disabled or Essentials isn't available // return false if feature is disabled or Essentials isn't available
public static boolean handleTeleport(Player player, Location loc) public static boolean handleTeleport(Player player, Location loc)

53
src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
View File

@ -1,53 +0,0 @@
package com.massivecraft.factions.integration;
import org.bukkit.entity.Player;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.listeners.FactionsChatListener;
import com.earth2me.essentials.chat.EssentialsChat;
import com.earth2me.essentials.chat.IEssentialsChatListener;
/*
* This Essentials integration handler is for older 2.x.x versions of Essentials which have "IEssentialsChatListener"
*/
public class EssentialsOldVersionFeatures
{
private static EssentialsChat essChat;
public static void integrateChat(EssentialsChat instance)
{
essChat = instance;
try
{
essChat.addEssentialsChatListener("Factions", new IEssentialsChatListener()
{
public boolean shouldHandleThisChat(AsyncPlayerChatEvent event)
{
return Factions.p.shouldLetFactionsHandleThisChat(event);
}
public String modifyMessage(AsyncPlayerChatEvent event, Player target, String message)
{
return FactionsChatListener.parseTags(message, event.getPlayer(), target);
//return message.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(event.getPlayer()));
}
});
Factions.p.log("Found and will integrate chat with "+essChat.getDescription().getFullName());
}
catch (NoSuchMethodError ex)
{
essChat = null;
}
}
public static void unhookChat()
{
if (essChat != null)
{
essChat.removeEssentialsChatListener("Factions");
}
}
}