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

Add back support for older EssentialsChat versions

Browse Source 
also reword leader command's "you must be leader" error message
This commit is contained in:
Brettflan 2012-02-07 15:31:35 -06:00
parent 296c783627
commit fbbf0a12af
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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.capi.CapiFeatures;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.EssentialsFeatures; import com.massivecraft.factions.integration.EssentialsFeatures;
import com.massivecraft.factions.integration.EssentialsOldVersionFeatures;
import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.LWCFeatures;
import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.integration.Worldguard; import com.massivecraft.factions.integration.Worldguard;
@ -194,8 +195,7 @@ public class P extends MPlugin
// no? try older Essentials 2.x integration method // no? try older Essentials 2.x integration method
try try
{ {
// TODO: Creates errors in eclipse EssentialsOldVersionFeatures.integrateChat(essChat);
//EssentialsOldVersionFeatures.integrateChat(essChat);
} }
catch (NoClassDefFoundError ex2) catch (NoClassDefFoundError ex2)
{ {
@ -211,8 +211,7 @@ public class P extends MPlugin
{ {
try try
{ {
// TODO: Creates errors in eclipse EssentialsOldVersionFeatures.unhookChat();
//EssentialsOldVersionFeatures.unhookChat();
} }
catch (NoClassDefFoundError ex) catch (NoClassDefFoundError ex)
{ {

2
src/com/massivecraft/factions/cmd/CmdLeader.java
View File

@ -47,7 +47,7 @@ public class CmdLeader extends FCommand
// Follow the standard rules // Follow the standard rules
if (fme.getRole() != Rel.LEADER || targetFaction != myFaction) if (fme.getRole() != Rel.LEADER || targetFaction != myFaction)
{ {
sender.sendMessage(p.txt.parse("<b>Only faction leaders can %s.", this.getHelpShort())); sender.sendMessage(p.txt.parse("<b>You must be leader of the faction to %s.", this.getHelpShort()));
return; return;
} }

2
src/com/massivecraft/factions/integration/EssentialsOldVersionFeaturesTODO.java → src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
View File

@ -14,7 +14,7 @@ import com.earth2me.essentials.chat.IEssentialsChatListener;
* This Essentials integration handler is for older 2.x.x versions of Essentials which have "IEssentialsChatListener" * This Essentials integration handler is for older 2.x.x versions of Essentials which have "IEssentialsChatListener"
*/ */
public class EssentialsOldVersionFeaturesTODO public class EssentialsOldVersionFeatures
{ {
private static EssentialsChat essChat; private static EssentialsChat essChat;