--- a/net/minecraft/server/TileEntityChest.java +++ b/net/minecraft/server/TileEntityChest.java @@ -2,15 +2,50 @@ import java.util.Iterator; import java.util.List; +// CraftBukkit start +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +// CraftBukkit end public class TileEntityChest extends TileEntityLootable implements ITickable { private NonNullList items; protected float a; protected float b; - protected int viewingCount; + public int viewingCount; // PAIL protected -> public private int j; + // CraftBukkit start - add fields and methods + public List transaction = new java.util.ArrayList(); + private int maxStack = MAX_STACK; + public boolean opened; + + public List getContents() { + return this.items; + } + + public void onOpen(CraftHumanEntity who) { + transaction.add(who); + } + + public void onClose(CraftHumanEntity who) { + transaction.remove(who); + } + + public List getViewers() { + return transaction; + } + + @Override + public int getMaxStackSize() { + return maxStack; + } + + public void setMaxStackSize(int size) { + maxStack = size; + } + // CraftBukkit end + protected TileEntityChest(TileEntityTypes tileentitytypes) { super(tileentitytypes); this.items = NonNullList.a(27, ItemStack.b); @@ -61,6 +96,13 @@ this.b = this.a; float f = 0.1F; + // CraftBukkit start - If chest is forced open by API, remove a viewer due to playBlockAction() call and don't tick to prevent sound effects. + if (opened) { + this.viewingCount--; + return; + } + // CraftBukkit end + if (this.viewingCount > 0 && this.a == 0.0F) { this.a(SoundEffects.BLOCK_CHEST_OPEN); } @@ -120,7 +162,7 @@ return l; } - private void a(SoundEffect soundeffect) { + public void a(SoundEffect soundeffect) { // PAIL private -> public, rename playSound BlockPropertyChestType blockpropertychesttype = (BlockPropertyChestType) this.getBlock().get(BlockChest.c); if (blockpropertychesttype != BlockPropertyChestType.LEFT) { @@ -155,8 +197,20 @@ if (this.viewingCount < 0) { this.viewingCount = 0; } + int oldPower = Math.max(0, Math.min(15, this.viewingCount)); // CraftBukkit - Get power before new viewer is added ++this.viewingCount; + if (this.world == null) return; // CraftBukkit + + // CraftBukkit start - Call redstone event + if (this.getBlock().getBlock() == Blocks.TRAPPED_CHEST) { + int newPower = Math.max(0, Math.min(15, this.viewingCount)); + + if (oldPower != newPower) { + org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, position, oldPower, newPower); + } + } + // CraftBukkit end this.onOpen(); } @@ -165,7 +219,18 @@ @Override public void closeContainer(EntityHuman entityhuman) { if (!entityhuman.isSpectator()) { + int oldPower = Math.max(0, Math.min(15, this.viewingCount)); // CraftBukkit - Get power before new viewer is added --this.viewingCount; + + // CraftBukkit start - Call redstone event + if (this.getBlock().getBlock() == Blocks.TRAPPED_CHEST) { + int newPower = Math.max(0, Math.min(15, this.viewingCount)); + + if (oldPower != newPower) { + org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, position, oldPower, newPower); + } + } + // CraftBukkit end this.onOpen(); } @@ -175,7 +240,7 @@ Block block = this.getBlock().getBlock(); if (block instanceof BlockChest) { - this.world.playBlockAction(this.position, block, 1, this.viewingCount); + if (!opened) this.world.playBlockAction(this.position, block, 1, this.viewingCount); // CraftBukkit this.world.applyPhysics(this.position, block); } @@ -216,4 +281,11 @@ protected Container createContainer(int i, PlayerInventory playerinventory) { return ContainerChest.a(i, playerinventory, this); } + + // CraftBukkit start + @Override + public boolean isFilteredNBT() { + return true; + } + // CraftBukkit end }