summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockDeadBush.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/BlockDeadBush.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/BlockDeadBush.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockDeadBush.java49
1 files changed, 0 insertions, 49 deletions
diff --git a/src/main/java/net/minecraft/server/BlockDeadBush.java b/src/main/java/net/minecraft/server/BlockDeadBush.java
deleted file mode 100644
index fdb4573f..00000000
--- a/src/main/java/net/minecraft/server/BlockDeadBush.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package net.minecraft.server;
-
-import java.util.Random;
-
-public class BlockDeadBush extends BlockFlower {
-
- protected BlockDeadBush(int i, int j) {
- super(i, j, Material.REPLACEABLE_PLANT);
- float f = 0.4F;
-
- this.a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f);
- }
-
- protected boolean d(int i) {
- return i == Block.SAND.id;
- }
-
- public int a(int i, int j) {
- return this.textureId;
- }
-
- public int getDropType(int i, Random random, int j) {
- return -1;
- }
-
- public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
- if (!world.isStatic && entityhuman.U() != null && entityhuman.U().id == Item.SHEARS.id) {
- entityhuman.a(StatisticList.C[this.id], 1);
- /* CraftBukkit start - moved this line into calculateDrops
- this.a(world, i, j, k, new ItemStack(Block.DEAD_BUSH, 1, l));
- */
- this.doActualDrop(world, i, j, k);
- // CraftBukkit end
- } else {
- super.a(world, entityhuman, i, j, k, l);
- }
- }
-
- // CraftBukkit start - Calculate drops
- public java.util.ArrayList<ItemStack> calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
- if (!world.isStatic && entityhuman.U() != null && entityhuman.U().id == Item.SHEARS.id) {
- this.a(world, i, j, k, new ItemStack(Block.DEAD_BUSH, 1, l));
- } else {
- return super.calculateDrops(world, entityhuman, i, j, k, l);
- }
- return this.dropList;
- }
- // CraftBukkit end
-}