From 44234c47cedc4226fd118fbffd84866a3320e1af Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Sun, 5 Aug 2012 21:31:36 -0500 Subject: Cease execution if block is AIR. Fixes BUKKIT-2104 --- src/main/java/net/minecraft/server/ItemInWorldManager.java | 1 + src/main/java/net/minecraft/server/PlayerInventory.java | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'src/main/java/net') diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java index e163a2c0..aa63a1c4 100644 --- a/src/main/java/net/minecraft/server/ItemInWorldManager.java +++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java @@ -271,6 +271,7 @@ public class ItemInWorldManager { return false; } else { int l = this.world.getTypeId(i, j, k); + if (Block.byId[l] == null) return false; // CraftBukkit - a plugin set block to air without cancelling int i1 = this.world.getData(i, j, k); this.world.a(this.player, 2001, i, j, k, l + (this.world.getData(i, j, k) << 12)); diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java index 88566f49..f1275e68 100644 --- a/src/main/java/net/minecraft/server/PlayerInventory.java +++ b/src/main/java/net/minecraft/server/PlayerInventory.java @@ -363,12 +363,6 @@ public class PlayerInventory implements IInventory { } public boolean b(Block block) { - // CraftBukkit start - fixed NPE - if (block == null) { - return false; - } - // CraftBukkit end - if (block.material.isAlwaysDestroyable()) { return true; } else { -- cgit v1.2.3