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

Changes to the ascii map and minor tweaking

Browse Source
This commit is contained in:
Olof Larsson
2011-10-24 09:28:08 +02:00
parent 1ec7842ed4
commit bb5a676430
9 changed files with 101 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.java
View File

@ -22,6 +22,7 @@ import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.P;
// TODO: Is this one even used anymore??
public class MapFLocToStringSetTypeAdapter implements JsonDeserializer<Map<FLocation, Set<String>>>, JsonSerializer<Map<FLocation, Set<String>>>
{

22
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;
@ -121,26 +122,19 @@ public class RelationUtil
public static ChatColor getColorOfThatToMe(RelationParticipator that, RelationParticipator me)
{
//Faction thatFaction = getFaction(that);
// TODO: Add special colors to zone as a feature to replace this one
/*if (thatFaction != null)
Faction thatFaction = getFaction(that);
if (thatFaction != null && thatFaction != getFaction(me))
{
if (thatFaction.isPeaceful() && thatFaction != getFaction(me))
if (thatFaction.getFlag(FFlag.FRIENDLYFIRE) == true)
{
return Conf.colorPeaceful;
return Conf.colorFriendlyFire;
}
if (thatFaction.isSafeZone() && thatFaction != getFaction(me))
if (thatFaction.getFlag(FFlag.PVP) == false)
{
return Conf.colorPeaceful;
return Conf.colorNoPVP;
}
if (thatFaction.isWarZone() && thatFaction != getFaction(me))
{
return Conf.colorWar;
}
}*/
}
return getRelationTo(that, me).getColor();
}
}