EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Woop

Browse Source
This commit is contained in:
Olof Larsson
2011-10-23 22:08:57 +02:00
parent ac6870b770
commit 21783ef9d4
24 changed files with 149 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,10 @@ 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;
import com.massivecraft.factions.struct.FactionFlag;
import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.zcore.util.TextUtil;
@ -90,9 +90,9 @@ public class RelationUtil
return Rel.MEMBER;
}
if (!ignorePeaceful && (fme.isPeaceful() || fthat.isPeaceful()))
if (!ignorePeaceful && (fme.getFlag(FactionFlag.PEACEFUL) || fthat.getFlag(FactionFlag.PEACEFUL)))
{
return Rel.NEUTRAL;
return Rel.TRUCE;
}
if (fme.getRelationWish(fthat).value >= fthat.getRelationWish(fme).value)
@ -121,8 +121,9 @@ public class RelationUtil
public static ChatColor getColorOfThatToMe(RelationParticipator that, RelationParticipator me)
{
Faction thatFaction = getFaction(that);
if (thatFaction != null)
//Faction thatFaction = getFaction(that);
// TODO: Add special colors to zone as a feature to replace this one
/*if (thatFaction != null)
{
if (thatFaction.isPeaceful() && thatFaction != getFaction(me))
{
@ -138,7 +139,7 @@ public class RelationUtil
{
return Conf.colorWar;
}
}
}*/
return getRelationTo(that, me).getColor();
}