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

Moving colors to MConf

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 09:41:48 +02:00
parent 41bb3f6e05
commit ec8be2d2c0
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,12 +2,12 @@ package com.massivecraft.factions.util;
import org.bukkit.ChatColor;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.RelationParticipator;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.mcore.util.Txt;
public class RelationUtil
@ -135,12 +135,12 @@ public class RelationUtil
{
if (thatFaction.getFlag(FFlag.FRIENDLYFIRE) == true)
{
return ConfServer.colorFriendlyFire;
return MConf.get().colorFriendlyFire;
}
if (thatFaction.getFlag(FFlag.PVP) == false)
{
return ConfServer.colorNoPVP;
return MConf.get().colorNoPVP;
}
}
return getRelationOfThatToMe(that, me).getColor();