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

Minor tweaks to chatspy, added it to /f help

Browse Source
This commit is contained in:
Brettflan 2012-01-15 01:41:03 -06:00
parent 9ff68301e5
commit e8baaa2460
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/massivecraft/factions/cmd/CmdHelp.java
View File

@ -165,6 +165,7 @@ public class CmdHelp extends FCommand
pageLines = new ArrayList<String>(); pageLines = new ArrayList<String>();
pageLines.add(p.txt.parse("<i>More commands for server admins:")); pageLines.add(p.txt.parse("<i>More commands for server admins:"));
pageLines.add( p.cmdBase.cmdChatSpy.getUseageTemplate(true) );
pageLines.add(p.txt.parse("<i>Peaceful factions are protected from PvP and land capture.")); pageLines.add(p.txt.parse("<i>Peaceful factions are protected from PvP and land capture."));
pageLines.add( p.cmdBase.cmdLock.getUseageTemplate(true) ); pageLines.add( p.cmdBase.cmdLock.getUseageTemplate(true) );
pageLines.add( p.cmdBase.cmdReload.getUseageTemplate(true) ); pageLines.add( p.cmdBase.cmdReload.getUseageTemplate(true) );

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

@ -55,8 +55,8 @@ public class FactionsChatEarlyListener extends PlayerListener
//Send to any players who are spying chat //Send to any players who are spying chat
for (FPlayer fplayer : FPlayers.i.getOnline()) for (FPlayer fplayer : FPlayers.i.getOnline())
{ {
if( fplayer.isSpyingChat() ) if(fplayer.isSpyingChat() && fplayer.getFaction() != myFaction)
fplayer.sendMessage("FactionChat "+me.getFaction().getTag()+": "+message); fplayer.sendMessage("[FCspy] "+me.getFaction().getTag()+": "+message);
} }
event.setCancelled(true); event.setCancelled(true);
@ -79,11 +79,11 @@ public class FactionsChatEarlyListener extends PlayerListener
fplayer.sendMessage(message); fplayer.sendMessage(message);
//Send to any players who are spying chat //Send to any players who are spying chat
if( fplayer.isSpyingChat() ) else if(fplayer.isSpyingChat())
fplayer.sendMessage("AllianceChat " + message); fplayer.sendMessage("[ACspy]: " + message);
} }
P.p.log(Level.INFO, ChatColor.stripColor("AllianceChat "+message)); P.p.log(Level.INFO, ChatColor.stripColor("AllianceChat: "+message));
event.setCancelled(true); event.setCancelled(true);
return; return;