From c100e20d605a0dde2c2e149954324e1659a6108b Mon Sep 17 00:00:00 2001 From: Warren Loo Date: Tue, 27 Mar 2012 11:37:00 -0400 Subject: 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 --- src/main/java/net/minecraft/server/EntitySheep.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntitySheep.java') diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java index 53cad5c5..ff1bb825 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -3,12 +3,8 @@ package net.minecraft.server; import java.util.Random; // CraftBukkit start -import java.util.ArrayList; -import java.util.List; - import org.bukkit.Material; import org.bukkit.craftbukkit.event.CraftEventFactory; -import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.entity.Sheep; // CraftBukkit end @@ -84,12 +80,7 @@ public class EntitySheep extends EntityAnimal { if (itemstack != null && itemstack.id == Item.SHEARS.id && !this.isSheared() && !this.isBaby()) { if (!this.world.isStatic) { // CraftBukkit start - int i = 1 + this.random.nextInt(3); - List drops = new ArrayList(); - for (int j = 0; j < i; ++j) { - drops.add(new CraftItemStack(Block.WOOL.id, 1, (short) this.getColor())); - } - 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()) { @@ -98,15 +89,10 @@ public class EntitySheep extends EntityAnimal { // CraftBukkit end this.setSheared(true); - /* CraftBukkit start - Moved this line to before the event is fired int i = 1 + this.random.nextInt(3); - // And this logic is changed to use the drop list from the event + for (int j = 0; j < i; ++j) { EntityItem entityitem = this.a(new ItemStack(Block.WOOL.id, 1, this.getColor()), 1.0F); - // */ - for (org.bukkit.inventory.ItemStack stack : drops) { - EntityItem entityitem = this.a(CraftItemStack.createNMSItemStack(stack), 1.0f); - // CraftBukkit end entityitem.motY += (double) (this.random.nextFloat() * 0.05F); entityitem.motX += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F); entityitem.motZ += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F); -- cgit v1.2.3