Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2015-11-29 18:03:46 -05:00
commit 2b22639d8a

View File

@ -154,7 +154,7 @@ public class ItemMapRenderer extends MapRenderer
//Checkin' //Checkin'
boolean checker = (mapX + (mapZ % 3)) % 3 == 0; boolean checker = (mapX + (mapZ % 3)) % 3 == 0;
Color drawColor = clanColor; Color drawColor = clanColor;
if (checker && clanColor2 == null) if (checker && clanColor2 != null)
drawColor = clanColor2; drawColor = clanColor2;
//Inside //Inside