Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

Cease execution if block is AIR. Fixes BUKKIT-2104

Browse Source
This commit is contained in:
Wesley Wolfe 2012-08-05 21:31:36 -05:00
parent a574ec54cc
commit 44234c47ce
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minecraft/server/ItemInWorldManager.java
View File

@ -271,6 +271,7 @@ public class ItemInWorldManager {
return false; return false;
} else { } else {
int l = this.world.getTypeId(i, j, k); 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); 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)); this.world.a(this.player, 2001, i, j, k, l + (this.world.getData(i, j, k) << 12));

6
src/main/java/net/minecraft/server/PlayerInventory.java
View File

@ -363,12 +363,6 @@ public class PlayerInventory implements IInventory {
} }
public boolean b(Block block) { public boolean b(Block block) {
// CraftBukkit start - fixed NPE
if (block == null) {
return false;
}
// CraftBukkit end
if (block.material.isAlwaysDestroyable()) { if (block.material.isAlwaysDestroyable()) {
return true; return true;
} else { } else {