diff options
author | Warren Loo <evilseph@gmail.com> | 2012-03-27 11:37:00 -0400 |
---|---|---|
committer | Warren Loo <evilseph@gmail.com> | 2012-03-27 20:04:26 -0400 |
commit | c100e20d605a0dde2c2e149954324e1659a6108b (patch) | |
tree | ca98a2be106bb69031bd94a5486bb702b599c77b /src/main/java/net/minecraft/server/EntityMushroomCow.java | |
parent | c16bf07e85feb5e7bcb3e4a98048de36fe7859f2 (diff) | |
download | craftbukkit-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/EntityMushroomCow.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityMushroomCow.java | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java index 295e0811..b3860ec9 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -1,12 +1,5 @@ package net.minecraft.server; -// CraftBukkit start -import java.util.ArrayList; -import java.util.List; - -import org.bukkit.craftbukkit.inventory.CraftItemStack; -// CraftBukkit end - public class EntityMushroomCow extends EntityCow { public EntityMushroomCow(World world) { @@ -23,11 +16,7 @@ public class EntityMushroomCow extends EntityCow { return true; } else if (itemstack != null && itemstack.id == Item.SHEARS.id && this.getAge() >= 0) { // CraftBukkit start - List<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>(); - for (int i = 0; i < 5; ++i) { - drops.add(new CraftItemStack(Block.RED_MUSHROOM.id, 1)); - } - org.bukkit.event.player.PlayerShearEntityEvent event = new org.bukkit.event.player.PlayerShearEntityEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), this.getBukkitEntity(), drops); + org.bukkit.event.player.PlayerShearEntityEvent event = new org.bukkit.event.player.PlayerShearEntityEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), this.getBukkitEntity()); this.world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -45,15 +34,9 @@ public class EntityMushroomCow extends EntityCow { entitycow.V = this.V; this.world.addEntity(entitycow); - /* CraftBukkit start - This logic moved up to before the event is fired ... for (int i = 0; i < 5; ++i) { this.world.addEntity(new EntityItem(this.world, this.locX, this.locY + (double) this.length, this.locZ, new ItemStack(Block.RED_MUSHROOM))); } - // ... and replaced by this logic */ - for (org.bukkit.inventory.ItemStack stack : drops) { - this.world.addEntity(new EntityItem(this.world, this.locX, this.locY + this.length, this.locZ, CraftItemStack.createNMSItemStack(stack))); - } - // CraftBukkit end } return true; |