JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Shaun Bennett 2015-11-29 18:26:40 -05:00
commit f7f7d5fdef
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java
View File

@ -152,8 +152,7 @@ public class ItemMapRenderer extends MapRenderer
int chunkX1 = (int) Math.floor(blockX / 16D);
int chunkZ1 = (int) Math.floor(blockZ / 16D);
//Inside
//Border
if (colorAll ||
((chunkBX == 0 || zoom == 13) &&
@ -175,13 +174,11 @@ public class ItemMapRenderer extends MapRenderer
Color cColor = MapPalette.getColor(color);
double clans = colorAll ? 1 : 0.8;// 0.65;
//Stripes
boolean checker = (mapX + (mapZ % 3)) % 3 == 0;
//Use clanColor2 no matter what for admins
Color drawColor = clanColor;
if (checker && clanColor2 != null)
if (owningClan.isAdmin() && clanColor2 != null)
{
drawColor = clanColor2;
clans = 0.65;
}
double base = 1 - clans;
@ -192,18 +189,23 @@ public class ItemMapRenderer extends MapRenderer
color = MapPalette.matchColor(r, g, b);
}
//Border
//Inside
else
{
Color cColor = MapPalette.getColor(color);
double clans = 0.65;// 0.4;
//Use clanColor2 no matter what for admins
//Stripes
boolean checker = (mapX + (mapZ % 3)) % 3 == 0;
Color drawColor = clanColor;
if (owningClan.isAdmin() && clanColor2 != null)
if (checker && clanColor2 != null)
{
drawColor = clanColor2;
clans = colorAll ? 1 : 0.8;
}
double base = 1 - clans;