EpicKnarvik97/Factions3
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

9
src/com/massivecraft/factions/util/RelationUtil.java
View File

@ -2,6 +2,7 @@ package com.massivecraft.factions.util;
import org.bukkit.ChatColor;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.iface.RelationParticipator;
@ -53,7 +54,7 @@ public class RelationUtil
ret = TextUtil.upperCaseFirst(ret);
}
return "" + getRelationColor(me, that) + ret;
return "" + getColorOfThatToMe(that, me) + ret;
}
public static String describeThatToMe(RelationParticipator that, RelationParticipator me)
@ -113,8 +114,12 @@ public class RelationUtil
return null;
}
public static ChatColor getRelationColor(RelationParticipator me, RelationParticipator that)
public static ChatColor getColorOfThatToMe(RelationParticipator that, RelationParticipator me)
{
if (getFaction(that) != null && getFaction(that).isPeaceful() && getFaction(that) != getFaction(me))
{
return Conf.colorPeaceful;
}
return getRelationTo(that, me).getColor();
}
}