Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-12-27 02:58:07 +01:00
Code Issues Projects Releases Wiki Activity

minor cleanup

Browse Source
This commit is contained in:
Brettflan 2011-08-19 19:41:28 -05:00
parent 4e7aa893a3
commit 62f80a607b
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/Econ.java
View File

@ -41,7 +41,7 @@ public class Econ {
public static void iConomySet(boolean enable) { public static void iConomySet(boolean enable) {
iConomyUse = enable; iConomyUse = enable;
if (enable) { if (enable) {
Factions.log("Hooked into iConomy, "+(Conf.econIConomyEnabled ? "and interface is enabled" : "but interface is currently disabled (\"econIConomyEnabled\": false)")+"."); Factions.log("iConomy hook available, "+(Conf.econIConomyEnabled ? "and interface is enabled" : "but disabled (\"econIConomyEnabled\": false)")+".");
} }
else { else {
Factions.log("Un-hooked from iConomy."); Factions.log("Un-hooked from iConomy.");
@ -51,7 +51,7 @@ public class Econ {
public static void essentialsEcoSet(boolean enable) { public static void essentialsEcoSet(boolean enable) {
essEcoUse = enable; essEcoUse = enable;
if (enable) { if (enable) {
Factions.log("Hooked into EssentialsEco, "+(Conf.econEssentialsEcoEnabled ? "and interface is enabled" : "but interface is currently disabled (\"econEssentialsEcoEnabled\": false)")+"."); Factions.log("EssentialsEco hook available, "+(Conf.econEssentialsEcoEnabled ? "and interface is enabled" : "but disabled (\"econEssentialsEcoEnabled\": false)")+".");
} }
else { else {
Factions.log("Un-hooked from EssentialsEco."); Factions.log("Un-hooked from EssentialsEco.");

1
src/com/massivecraft/factions/listeners/FactionsChatEarlyListener.java
View File

@ -20,6 +20,7 @@ public class FactionsChatEarlyListener extends PlayerListener{
@Override @Override
public void onPlayerChat(PlayerChatEvent event) { public void onPlayerChat(PlayerChatEvent event) {
// Is it a slashless Factions command?
if ((event.getMessage().startsWith(Factions.instance.getBaseCommand()+" ") || event.getMessage().equals(Factions.instance.getBaseCommand())) && Conf.allowNoSlashCommand) { if ((event.getMessage().startsWith(Factions.instance.getBaseCommand()+" ") || event.getMessage().equals(Factions.instance.getBaseCommand())) && Conf.allowNoSlashCommand) {
String msg = event.getMessage().trim(); String msg = event.getMessage().trim();
// make sure command isn't denied due to being in enemy/neutral territory // make sure command isn't denied due to being in enemy/neutral territory