Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2015-11-29 19:05:56 -05:00
commit 981eead816

View File

@ -106,12 +106,12 @@ public class ItemMapRenderer extends MapRenderer
clanColor2 = new Color(50, 150, 255);
if (_manager.getClansUtility().relPT(player, chunk) == ClansUtility.ClanRelation.SAFE)
clanColor = new Color(100, 200, 255);
clanColor2 = new Color(50, 150, 255);
}
else if (owningClan.getName().equals("Spawn"))
{
clanColor = Color.WHITE;
clanColor2 = new Color(0, 255, 100);
clanColor2 = new Color(50, 255, 150);
}
else if (owningClan.getName().equals("Fields"))
{
@ -199,10 +199,10 @@ public class ItemMapRenderer extends MapRenderer
{
Color cColor = MapPalette.getColor(color);
double clans = 0.65;// 0.4;
double clans = 0.04;
//Stripes
boolean checker = (mapX + (mapZ % 3)) % 3 == 0;
boolean checker = (mapX + (mapZ % 4)) % 4 == 0;
Color drawColor = clanColor;
if (checker && clanColor2 != null)
{