summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockDoor.java
diff options
context:
space:
mode:
authorWarren Loo <evilseph@gmail.com>2012-03-27 11:37:00 -0400
committerWarren Loo <evilseph@gmail.com>2012-03-27 20:04:26 -0400
commitc100e20d605a0dde2c2e149954324e1659a6108b (patch)
treeca98a2be106bb69031bd94a5486bb702b599c77b /src/main/java/net/minecraft/server/BlockDoor.java
parentc16bf07e85feb5e7bcb3e4a98048de36fe7859f2 (diff)
downloadcraftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar
craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.gz
craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.lz
craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.xz
craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.zip
Reverting the Drop API for now, we need to re-evalute this as it is causing too many issues and blocking releases.
This reverts commits: - d2d03afc8854394aeefb40ea5ebf224c8032b19f - 6245746e91123dd8ef70e5f15b7cdfc7e36d8e8c - 41fae5c613e9e69a8f6bdf33b23bb09d7f407433 - c34bdecab42cf4098054a5ea43e1c2958d44ae92 - d7445084ac9a90fa0b66d8b050b8d0d2a062eaf3 - 6a6ed2e6ae2328a8a791bcc6857c44dc6c6a7030 - a783bc4dc95da8e26c673abe48fad96b550aba28 - cb50fd68766df8e07631ba5be85759f8257e8068 - 34dfff2ad5c407c712b2783f02960aac5e8649f2 - f33b513820de987b49a4338e85df80968217a601 - 5fd9fdfde055e6eb6a83db246d009b69377b7c94 - 2795b116f40d06551fbb7b96d1963c0ddbeac384
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockDoor.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockDoor.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java
index e6b1599b..8ce6fc8d 100644
--- a/src/main/java/net/minecraft/server/BlockDoor.java
+++ b/src/main/java/net/minecraft/server/BlockDoor.java
@@ -157,7 +157,7 @@ public class BlockDoor extends Block {
if (world.getTypeId(i, j + 1, k) != this.id) {
world.setTypeId(i, j, k, 0);
- //flag = true; // CraftBukkit
+ flag = true;
}
if (!world.e(i, j - 1, k)) {
@@ -172,6 +172,7 @@ public class BlockDoor extends Block {
if (!world.isStatic) {
this.b(world, i, j, k, i1, 0);
}
+ // CraftBukkit start
} else if (l > 0 && Block.byId[l].isPowerSource()) {
org.bukkit.World bworld = world.getWorld();
org.bukkit.block.Block block = bworld.getBlockAt(i, j, k);
@@ -194,7 +195,7 @@ public class BlockDoor extends Block {
}
public int getDropType(int i, Random random, int j) {
- return /* (i & 8) != 0 ? 0 CraftBukkit : */ (this.material == Material.ORE ? Item.IRON_DOOR.id : Item.WOOD_DOOR.id);
+ return (i & 8) != 0 ? 0 : (this.material == Material.ORE ? Item.IRON_DOOR.id : Item.WOOD_DOOR.id);
}
public MovingObjectPosition a(World world, int i, int j, int k, Vec3D vec3d, Vec3D vec3d1) {