Update CraftBukkit to 1.6.1

2013-07-01 06:03:00 -05:00
parent f887b76a25
commit 6c09066e22
228 changed files with 6426 additions and 5442 deletions
--- a/src/main/java/net/minecraft/server/BlockPressurePlateBinary.java
+++ b/src/main/java/net/minecraft/server/BlockPressurePlateBinary.java
@@ -37,7 +37,7 @@ public class BlockPressurePlateBinary extends BlockPressurePlateAbstract {
            list = world.a(EntityHuman.class, this.a(i, j, k));
        }

-        if (!list.isEmpty()) {
+        if (list != null && !list.isEmpty()) {
            Iterator iterator = list.iterator();

            while (iterator.hasNext()) {
@@ -63,7 +63,7 @@ public class BlockPressurePlateBinary extends BlockPressurePlateAbstract {
                }
                // CraftBukkit end

-                if (!entity.at()) {
+                if (!entity.as()) {
                    return 15;
                }
            }