diff options
author | Celtic Minstrel <celtic.minstrel.ca@some.place> | 2012-02-29 13:56:35 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-02-29 15:19:07 -0500 |
commit | 0842bab48b1c24f113c61606a294f5bcdf2e1315 (patch) | |
tree | e10864f22a8c54129d4e670ec15b8da594c333eb /src/main/java/net/minecraft/server/TileEntityBrewingStand.java | |
parent | 10e593649c224db2f0a4227bdf6eef44bfa16865 (diff) | |
download | craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.gz craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.lz craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.xz craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.zip |
[Bleeding] Implementation of inventory framework. Addresses BUKKIT-856
See the corresponding Bukkit commit for details.
Implementation details:
- Any packets that include an itemstack will send air stacks as null; maybe this will even eliminate the client crash that occurs if the client receives an air stack
- Better handling of null itemstacks in general (ie less converting them to air stacks)
- Inventory.setContents() can now take an array smaller than the inventory without error
- Player.updateInventory() should now correctly update the result slot in a crafting inventory
Some small credit goes to Afforess (initial implementation of openInventory() methods) and Drakia (initial implementation of InventoryOpenEvent and InventoryCloseEvent).
Diffstat (limited to 'src/main/java/net/minecraft/server/TileEntityBrewingStand.java')
-rw-r--r-- | src/main/java/net/minecraft/server/TileEntityBrewingStand.java | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java index 328dafa6..466b65eb 100644 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java @@ -2,6 +2,16 @@ package net.minecraft.server; import java.util.List; +// CraftBukkit start +import java.util.ArrayList; + +import org.bukkit.Bukkit; +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +import org.bukkit.event.inventory.BrewEvent; +import org.bukkit.inventory.BrewerInventory; +// CraftBukkit end + public class TileEntityBrewingStand extends TileEntity implements IInventory { public ItemStack[] a = new ItemStack[4]; // CraftBukkit private -> public @@ -12,6 +22,20 @@ public class TileEntityBrewingStand extends TileEntity implements IInventory { public TileEntityBrewingStand() {} // CraftBukkit start + public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); + + public void onOpen(CraftHumanEntity who) { + transaction.add(who); + } + + public void onClose(CraftHumanEntity who) { + transaction.remove(who); + } + + public List<HumanEntity> getViewers() { + return transaction; + } + public ItemStack[] getContents() { return this.a; } @@ -97,6 +121,12 @@ public class TileEntityBrewingStand extends TileEntity implements IInventory { if (this.o()) { ItemStack itemstack = this.a[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; + // CraftBukkit end + for (int i = 0; i < 3; ++i) { if (this.a[i] != null && this.a[i].id == Item.POTION.id) { int j = this.a[i].getData(); |