Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 05:05:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v3.0' of https://github.com/webbukkit/dynmap.git into v3.0

Browse Source
This commit is contained in:
Mike Primm 2019-01-27 14:16:22 -06:00
commit e7113dc163
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DynmapCore/src/main/java/org/dynmap/PlayerFaces.java
View File

@ -62,9 +62,12 @@ public class PlayerFaces {
{ {
int[] l1 = new int[w * h]; int[] l1 = new int[w * h];
int[] l2 = new int[w * h]; int[] l2 = new int[w * h];
int imgh = srcimg.getHeight();
// Read layer 1 // Read layer 1
if (imgh >= (layer1y+h))
srcimg.getRGB(layer1x, layer1y, w, h, l1, 0, w); srcimg.getRGB(layer1x, layer1y, w, h, l1, 0, w);
// Read layer 2 // Read layer 2
if (imgh >= (layer2y+h))
srcimg.getRGB(layer2x, layer2y, w, h, l2, 0, w); srcimg.getRGB(layer2x, layer2y, w, h, l2, 0, w);
// Apply layer1 to layer 1 // Apply layer1 to layer 1
boolean transp = false; boolean transp = false;
@ -137,7 +140,7 @@ public class PlayerFaces {
if(img == null) { /* No image to process? Quit */ if(img == null) { /* No image to process? Quit */
return; return;
} }
if((img.getWidth() < 64) || (img.getHeight() < 64)) { if((img.getWidth() < 64) || (img.getHeight() < 32)) {
img.flush(); img.flush();
return; return;
} }