diff options
author | Celtic Minstrel <celtic.minstrel.ca@some.place> | 2012-03-05 14:21:43 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-03-21 12:42:51 -0400 |
commit | 5ba892804158ba81b655826469363eefa8f0baaa (patch) | |
tree | 75daade710326db6487550877a21a8557951bc52 /src/main/java/net/minecraft/server/BlockBed.java | |
parent | 8d62de7055a8c901240412ac41f3cb5091ea41a9 (diff) | |
download | craftbukkit-5ba892804158ba81b655826469363eefa8f0baaa.tar craftbukkit-5ba892804158ba81b655826469363eefa8f0baaa.tar.gz craftbukkit-5ba892804158ba81b655826469363eefa8f0baaa.tar.lz craftbukkit-5ba892804158ba81b655826469363eefa8f0baaa.tar.xz craftbukkit-5ba892804158ba81b655826469363eefa8f0baaa.zip |
[Bleeding] Added getting and setting drops to all appropriate events. Fixes BUKKIT-397 and fixes BUKKIT-1252
- Allows drops in creative mode by adding items to the getDrops() list
- Contents of containers are not reported
- Contents of storage minecarts are not reported
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockBed.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockBed.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java index 68232ad8..cc93b4ca 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -129,14 +129,16 @@ public class BlockBed extends BlockDirectional { } } else if (world.getTypeId(i + a[j1][0], j, k + a[j1][1]) != this.id) { world.setTypeId(i, j, k, 0); + /* CraftBukkit - Move this to on break instead of on physics if (!world.isStatic) { this.b(world, i, j, k, i1, 0); } + // */ } } public int getDropType(int i, Random random, int j) { - return d(i) ? 0 : Item.BED.id; + return /* d(i) ? 0 CraftBukkit : */ Item.BED.id; } private void s() { @@ -190,9 +192,9 @@ public class BlockBed extends BlockDirectional { } public void dropNaturally(World world, int i, int j, int k, int l, float f, int i1) { - if (!d(l)) { + //if (!d(l)) { // CraftBukkit super.dropNaturally(world, i, j, k, l, f, 0); - } + // } // CraftBukkit } public int g() { |