Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2015-11-29 19:30:51 -05:00
commit 34c4bade06

View File

@ -111,7 +111,7 @@ public class ItemMapRenderer extends MapRenderer
else if (owningClan.getName().equals("Spawn"))
{
clanColor = Color.WHITE;
clanColor2 = new Color(50, 255, 150);
clanColor2 = new Color(0, 255, 100);
}
else if (owningClan.getName().equals("Fields"))
{
@ -181,6 +181,7 @@ public class ItemMapRenderer extends MapRenderer
if (owningClan.isAdmin() && clanColor2 != null)
{
drawColor = clanColor2;
clans = 1;
}
double base = 1 - clans;
@ -199,15 +200,15 @@ public class ItemMapRenderer extends MapRenderer
{
Color cColor = MapPalette.getColor(color);
double clans = 0.04;
double clans = 0.065;
//Stripes
boolean checker = (mapX + (mapZ % 4)) % 4 == 0;
Color drawColor = clanColor;
if (checker && clanColor2 != null)
if (checker && owningClan.isAdmin() && clanColor2 != null)
{
drawColor = clanColor2;
clans = colorAll ? 1 : 0.8;
clans = 1;
}
double base = 1 - clans;