Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
25bb913c4f
@ -103,20 +103,20 @@ public class ItemMapRenderer extends MapRenderer
|
||||
if (owningClan.getName().equals("Shops"))
|
||||
{
|
||||
clanColor = Color.WHITE;
|
||||
clanColor2 = Color.CYAN;
|
||||
clanColor2 = new Color(50, 150, 255);
|
||||
|
||||
if (_manager.getClansUtility().relPT(player, chunk) == ClansUtility.ClanRelation.SAFE)
|
||||
clanColor = Color.CYAN;
|
||||
clanColor = new Color(100, 200, 255);
|
||||
}
|
||||
else if (owningClan.getName().equals("Spawn"))
|
||||
{
|
||||
clanColor = Color.WHITE;
|
||||
clanColor2 = Color.GREEN;
|
||||
clanColor2 = new Color(0, 255, 100);
|
||||
}
|
||||
if (owningClan.getName().equals("Fields"))
|
||||
else if (owningClan.getName().equals("Fields"))
|
||||
{
|
||||
clanColor = Color.WHITE;
|
||||
clanColor2 = Color.ORANGE;
|
||||
clanColor2 = new Color(255, 120, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user