Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2015-11-29 18:33:43 -05:00
commit 4a9d53de50

View File

@ -103,9 +103,10 @@ public class ItemMapRenderer extends MapRenderer
if (owningClan.getName().equals("Shops"))
{
clanColor = Color.WHITE;
clanColor2 = Color.CYAN;
if (_manager.getClansUtility().relPT(player, chunk) == ClansUtility.ClanRelation.SAFE)
clanColor2 = Color.CYAN;
clanColor = Color.CYAN;
}
else if (owningClan.getName().equals("Spawn"))
{
@ -115,11 +116,12 @@ public class ItemMapRenderer extends MapRenderer
if (owningClan.getName().equals("Fields"))
{
clanColor = Color.WHITE;
clanColor2 = Color.RED;
clanColor2 = Color.ORANGE;
}
else
{
clanColor = Color.LIGHT_GRAY;
clanColor = Color.WHITE;
clanColor2 = Color.GRAY;
}
}
else if (relation == ClansUtility.ClanRelation.WAR_LOSING)