From 704fc7fb32010adae8c05aa83df377fa9cdf9a81 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Tue, 30 Aug 2011 18:13:59 -0500
Subject: [PATCH] Yet another face fix - hopefully got the rules on accessories
 right this time...

---
 src/main/java/org/dynmap/PlayerFaces.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/dynmap/PlayerFaces.java b/src/main/java/org/dynmap/PlayerFaces.java
index 470d1038..19210b72 100644
--- a/src/main/java/org/dynmap/PlayerFaces.java
+++ b/src/main/java/org/dynmap/PlayerFaces.java
@@ -56,16 +56,21 @@ public class PlayerFaces {
             int[] faceaccessory = new int[64];  /* 8x8 of face accessory */
             /* Get buffered image for face at 8x8 */
             DynmapBufferedImage face8x8 = DynmapBufferedImage.allocateBufferedImage(8, 8);
-            int[] bgcolor = new int[1];
-            img.getRGB(0, 0, 1, 1, bgcolor, 0, 1);  /* Get BG color (for accessory face) */
             img.getRGB(8, 8, 8, 8, face8x8.argb_buf, 0, 8); /* Read face from image */
             img.getRGB(40, 8, 8, 8, faceaccessory, 0, 8); /* Read face accessory from image */
-            /* Apply accessory to face: first element is transparency color so only ones not matching it */
+            /* Apply accessory to face: see if anything is transparent (if so, apply accessory */
+            boolean transp = false;
             for(int i = 0; i < 64; i++) {
-                if(faceaccessory[i] != bgcolor[0]) 
-                    face8x8.argb_buf[i] = faceaccessory[i];
-                else if(face8x8.argb_buf[i] == bgcolor[0])
-                    face8x8.argb_buf[i] = 0;
+            	if((faceaccessory[i] & 0xFF000000) == 0) {
+            		transp = true;
+            		break;
+            	}
+            }
+            if(transp) {
+                for(int i = 0; i < 64; i++) {
+                	if((faceaccessory[i] & 0xFF000000) != 0)
+                		face8x8.argb_buf[i] = faceaccessory[i];
+                }
             }
             /* Write 8x8 file */
             File img_8x8 = new File(faces8x8dir, playername + ".png");