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

Reworked chat completely. Added Herochat integration. New tag-parsing system. Non-monitor-breaking relation colored chat.

Browse Source
This commit is contained in:
Olof Larsson
2012-05-02 04:45:10 +02:00
parent 06d22549e2
commit 1459c9c057
14 changed files with 316 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.LWCFeatures;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.integration.Worldguard;
import com.massivecraft.factions.struct.ChatMode;
import com.massivecraft.factions.struct.FFlag;
import com.massivecraft.factions.struct.FPerm;
import com.massivecraft.factions.struct.Rel;
@@ -99,23 +98,6 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
// FIELD: loginPvpDisabled
private transient boolean loginPvpDisabled;
// FIELD: 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: chatSpy
private transient boolean spyingChat = false;
public void setSpyingChat(boolean chatSpying) { this.spyingChat = chatSpying; }
public boolean isSpyingChat() { return spyingChat; }
// FIELD: account
public String getAccountId() { return this.getId(); }
@@ -153,7 +135,6 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
}
this.factionId = "0"; // The default neutral faction
this.chatMode = ChatMode.PUBLIC;
this.role = Rel.MEMBER;
this.title = "";
this.autoClaimFor = null;