From 20c6388ed3f7d9ab943abf7d38e1dcf32b334f3d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Mar 2017 14:51:02 -0600 Subject: [PATCH] Remove unnecessary item drop fiddling. closes #2175, #2126 --- .../vazkii/botania/common/block/mana/BlockForestDrum.java | 7 ++----- .../equipment/tool/elementium/ItemElementiumShears.java | 6 +----- .../item/equipment/tool/manasteel/ItemManasteelShears.java | 6 +----- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index d4267d3b2..5278129a9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -146,12 +146,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.posX + entity.width, entity.posY + entity.height, entity.posZ + entity.width)); for(EntityItem item : items) { ItemStack itemstack = item.getEntityItem(); - if(itemstack != null && itemstack.getItem() == Items.BUCKET && !world.isRemote) { + if(itemstack != null && itemstack.getItem() == Items.BUCKET) { while(itemstack.stackSize > 0) { - EntityItem ent = entity.entityDropItem(new ItemStack(Items.MILK_BUCKET), 1.0F); - ent.motionY += world.rand.nextFloat() * 0.05F; - ent.motionX += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; - ent.motionZ += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; + entity.entityDropItem(new ItemStack(Items.MILK_BUCKET), 1.0F); itemstack.stackSize--; } item.setDead(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 8499aa17d..5e6d71f1a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -68,12 +68,8 @@ public class ItemElementiumShears extends ItemManasteelShears { if(target.isShearable(stack, entity.worldObj, new BlockPos(entity))) { List drops = target.onSheared(stack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack)); - Random rand = new Random(); for(ItemStack drop : drops) { - EntityItem ent = entity.entityDropItem(drop, 1.0F); - ent.motionY += rand.nextFloat() * 0.05F; - ent.motionX += (rand.nextFloat() - rand.nextFloat()) * 0.1F; - ent.motionZ += (rand.nextFloat() - rand.nextFloat()) * 0.1F; + entity.entityDropItem(drop, 1.0F); } ToolCommons.damageItem(stack, 1, living, MANA_PER_DAMAGE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 44ca9b154..3d6c7ebf7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -75,12 +75,8 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem, I if(target.isShearable(itemstack, entity.worldObj, new BlockPos(entity))) { List drops = target.onSheared(itemstack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); - Random rand = new Random(); for(ItemStack stack : drops) { - EntityItem ent = entity.entityDropItem(stack, 1.0F); - ent.motionY += rand.nextFloat() * 0.05F; - ent.motionX += (rand.nextFloat() - rand.nextFloat()) * 0.1F; - ent.motionZ += (rand.nextFloat() - rand.nextFloat()) * 0.1F; + entity.entityDropItem(stack, 1.0F); } ToolCommons.damageItem(itemstack, 1, player, MANA_PER_DAMAGE);