Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2015-11-29 18:21:02 -05:00
commit 125d9988c2

View File

@ -99,11 +99,13 @@ public class ItemMapRenderer extends MapRenderer
if (owningClan.isAdmin())
{
colorAll = false;
if (owningClan.getName().equals("Shops"))
{
clanColor = Color.WHITE;
clanColor2 = Color.CYAN;
if (_manager.getClansUtility().relPT(player, chunk) == ClansUtility.ClanRelation.SAFE)
clanColor2 = Color.CYAN;
}
else if (owningClan.getName().equals("Spawn"))
{