EpicKnarvik97/Factions3
EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages 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

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

@ -23,8 +23,8 @@ public class Econ {
if (enabled()) { if (enabled()) {
return; return;
} }
if (!iConomyHooked()) { if (!iConomyHooked()) {
Plugin plug = factions.getServer().getPluginManager().getPlugin("iConomy"); Plugin plug = factions.getServer().getPluginManager().getPlugin("iConomy");
if (plug != null && plug.getClass().getName().equals("com.iConomy.iConomy") && plug.isEnabled()) { if (plug != null && plug.getClass().getName().equals("com.iConomy.iConomy") && plug.isEnabled()) {
iConomySet(true); iConomySet(true);
@ -35,13 +35,13 @@ public class Econ {
if (plug != null && plug.isEnabled()) { if (plug != null && plug.isEnabled()) {
essentialsEcoSet(true); essentialsEcoSet(true);
} }
} }
} }
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.");

2
src/com/massivecraft/factions/commands/FCommandCreate.java
View File

@ -61,7 +61,7 @@ public class FCommandCreate extends FBaseCommand {
faction.setTag(tag); faction.setTag(tag);
me.setRole(Role.ADMIN); me.setRole(Role.ADMIN);
me.setFaction(faction); me.setFaction(faction);
for (FPlayer follower : FPlayer.getAllOnline()) { for (FPlayer follower : FPlayer.getAllOnline()) {
follower.sendMessage(me.getNameAndRelevant(follower)+Conf.colorSystem+" created a new faction "+faction.getTag(follower)); follower.sendMessage(me.getNameAndRelevant(follower)+Conf.colorSystem+" created a new faction "+faction.getTag(follower));
} }

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