diff options
| author | Travis Watkins <amaranth@ubuntu.com> | 2012-04-25 16:37:17 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-04-25 22:43:15 -0400 |
| commit | 53ed0dad486b79e3dac1177b47a3456897de5b05 (patch) | |
| tree | 897d1f6de4c96e2a19a3dc08858488128dd79de2 /src/main/java/net/minecraft/server | |
| parent | 3e382034e96ecd57a53898f8d5290a5c64804597 (diff) | |
| download | craftbukkit-53ed0dad486b79e3dac1177b47a3456897de5b05.tar craftbukkit-53ed0dad486b79e3dac1177b47a3456897de5b05.tar.gz craftbukkit-53ed0dad486b79e3dac1177b47a3456897de5b05.tar.lz craftbukkit-53ed0dad486b79e3dac1177b47a3456897de5b05.tar.xz craftbukkit-53ed0dad486b79e3dac1177b47a3456897de5b05.zip | |
Don't call event if getOwner is null. Fixes BUKKIT-1545
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/TileEntityBrewingStand.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java index abfa178b..f5c15f92 100644 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java @@ -127,9 +127,13 @@ public class TileEntityBrewingStand extends TileEntity implements IInventory { ItemStack itemstack = this.items[3]; // CraftBukkit start - fire BREW event - BrewEvent event = new BrewEvent(world.getWorld().getBlockAt(x, y, z), (BrewerInventory) this.getOwner().getInventory()); - Bukkit.getPluginManager().callEvent(event); - if(event.isCancelled()) return; + if (getOwner() != null) { + BrewEvent event = new BrewEvent(world.getWorld().getBlockAt(x, y, z), (BrewerInventory) this.getOwner().getInventory()); + Bukkit.getPluginManager().callEvent(event); + if(event.isCancelled()) { + return; + } + } // CraftBukkit end for (int i = 0; i < 3; ++i) { |