Update CraftBukkit to Minecraft 1.5.2

1 files changed, 12 insertions, 12 deletions

diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
index 14a62455..97c953bb 100644
--- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
+++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java
@@ -116,9 +116,9 @@ public class Packet51MapChunk extends Packet {
         int l;
 
         for (l = 0; l < achunksection.length; ++l) {
-            if (achunksection[l] != null && (!flag || !achunksection[l].a()) && (i & 1 << l) != 0) {
+            if (achunksection[l] != null && (!flag || !achunksection[l].isEmpty()) && (i & 1 << l) != 0) {
                 chunkmap.b |= 1 << l;
-                if (achunksection[l].i() != null) {
+                if (achunksection[l].getExtendedIdArray() != null) {
                     chunkmap.c |= 1 << l;
                     ++k;
                 }
@@ -126,8 +126,8 @@ public class Packet51MapChunk extends Packet {
         }
 
         for (l = 0; l < achunksection.length; ++l) {
-            if (achunksection[l] != null && (!flag || !achunksection[l].a()) && (i & 1 << l) != 0) {
-                byte[] abyte1 = achunksection[l].g();
+            if (achunksection[l] != null && (!flag || !achunksection[l].isEmpty()) && (i & 1 << l) != 0) {
+                byte[] abyte1 = achunksection[l].getIdArray();
 
                 System.arraycopy(abyte1, 0, abyte, j, abyte1.length);
                 j += abyte1.length;
@@ -137,16 +137,16 @@ public class Packet51MapChunk extends Packet {
         NibbleArray nibblearray;
 
         for (l = 0; l < achunksection.length; ++l) {
-            if (achunksection[l] != null && (!flag || !achunksection[l].a()) && (i & 1 << l) != 0) {
-                nibblearray = achunksection[l].j();
+            if (achunksection[l] != null && (!flag || !achunksection[l].isEmpty()) && (i & 1 << l) != 0) {
+                nibblearray = achunksection[l].getDataArray();
                 System.arraycopy(nibblearray.a, 0, abyte, j, nibblearray.a.length);
                 j += nibblearray.a.length;
             }
         }
 
         for (l = 0; l < achunksection.length; ++l) {
-            if (achunksection[l] != null && (!flag || !achunksection[l].a()) && (i & 1 << l) != 0) {
-                nibblearray = achunksection[l].k();
+            if (achunksection[l] != null && (!flag || !achunksection[l].isEmpty()) && (i & 1 << l) != 0) {
+                nibblearray = achunksection[l].getEmittedLightArray();
                 System.arraycopy(nibblearray.a, 0, abyte, j, nibblearray.a.length);
                 j += nibblearray.a.length;
             }
@@ -154,8 +154,8 @@ public class Packet51MapChunk extends Packet {
 
         if (!chunk.world.worldProvider.f) {
             for (l = 0; l < achunksection.length; ++l) {
-                if (achunksection[l] != null && (!flag || !achunksection[l].a()) && (i & 1 << l) != 0) {
-                    nibblearray = achunksection[l].l();
+                if (achunksection[l] != null && (!flag || !achunksection[l].isEmpty()) && (i & 1 << l) != 0) {
+                    nibblearray = achunksection[l].getSkyLightArray();
                     System.arraycopy(nibblearray.a, 0, abyte, j, nibblearray.a.length);
                     j += nibblearray.a.length;
                 }
@@ -164,8 +164,8 @@ public class Packet51MapChunk extends Packet {
 
         if (k > 0) {
             for (l = 0; l < achunksection.length; ++l) {
-                if (achunksection[l] != null && (!flag || !achunksection[l].a()) && achunksection[l].i() != null && (i & 1 << l) != 0) {
-                    nibblearray = achunksection[l].i();
+                if (achunksection[l] != null && (!flag || !achunksection[l].isEmpty()) && achunksection[l].getExtendedIdArray() != null && (i & 1 << l) != 0) {
+                    nibblearray = achunksection[l].getExtendedIdArray();
                     System.arraycopy(nibblearray.a, 0, abyte, j, nibblearray.a.length);
                     j += nibblearray.a.length;
                 }