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

Minor changes

Browse Source
This commit is contained in:
Olof Larsson 2011-10-14 15:40:03 +02:00
parent 00f6f4ab05
commit 04074bc2b4
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/massivecraft/factions/FPlayer.java
View File

@ -121,6 +121,15 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
// FIELD: chatMode // FIELD: chatMode
private ChatMode chatMode; private ChatMode chatMode;
public void setChatMode(ChatMode chatMode) { this.chatMode = chatMode; }
public ChatMode getChatMode()
{
if(this.factionId.equals("0") || ! Conf.factionOnlyChat)
{
this.chatMode = ChatMode.PUBLIC;
}
return chatMode;
}
// FIELD: account // FIELD: account
public MethodAccount getAccount() public MethodAccount getAccount()
@ -189,22 +198,6 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
public ChatMode getChatMode()
{
if(this.factionId.equals("0"))
{
return ChatMode.PUBLIC;
}
return chatMode;
}
public void setChatMode(ChatMode chatMode)
{
this.chatMode = chatMode;
}
public long getLastLoginTime() public long getLastLoginTime()
{ {
return lastLoginTime; return lastLoginTime;

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

@ -30,7 +30,7 @@ public class CmdChat extends FCommand
{ {
if ( ! Conf.factionOnlyChat ) if ( ! Conf.factionOnlyChat )
{ {
msg("<b>Faction-only chat is disabled on this server."); msg("<b>The built in chat chat channels are disabled on this server.");
return; return;
} }