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

Spout overlay support is missing for the new relation coloring. Otherwise done.

Browse Source
This commit is contained in:
Olof Larsson
2011-10-21 20:08:54 +02:00
parent 89b53a577a
commit e6d45a6aa2
9 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,11 +312,11 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
public String getNameAndTitle(Faction faction)
{
return this.getRelationColor(faction)+this.getNameAndTitle();
return this.getColorTo(faction)+this.getNameAndTitle();
}
public String getNameAndTitle(FPlayer fplayer)
{
return this.getRelationColor(fplayer)+this.getNameAndTitle();
return this.getColorTo(fplayer)+this.getNameAndTitle();
}
/*public String getNameAndTag(Faction faction)
@@ -372,11 +372,12 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
public String getChatTag(FPlayer fplayer)
{
if ( ! this.hasFaction()) {
if ( ! this.hasFaction())
{
return "";
}
return this.getRelationTo(fplayer).getColor()+getChatTag();
return this.getColorTo(fplayer)+getChatTag();
}
// -------------------------------
@@ -413,9 +414,9 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
}
@Override
public ChatColor getRelationColor(RelationParticipator rp)
public ChatColor getColorTo(RelationParticipator rp)
{
return RelationUtil.getRelationColor(this, rp);
return RelationUtil.getColorOfThatToMe(this, rp);
}
//----------------------------------------------//