From 5b0f9c4fd69af1db17d53941270f1f53c2b86a0b Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Mon, 7 Mar 2016 22:15:52 -0800
Subject: [PATCH] Adds fix for sheep shearing


diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
old mode 100644
new mode 100755
index 6d3afd8..1986feb
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1545,7 +1545,14 @@ public abstract class Entity implements ICommandListener {
             // CraftBukkit start - Capture drops for death event
             if (this instanceof EntityLiving) {
                 ((EntityLiving) this).drops.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack));
-                return null;
+                if(this instanceof EntitySheep){
+                    EntitySheep es = (EntitySheep) this;
+                    if(es.isSheared()){
+                        es.drops.remove(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack));
+                    }
+                }else {
+                    return null;
+                }
             }
             // CraftBukkit end
             EntityItem entityitem = new EntityItem(this.world, this.locX, this.locY + (double) f, this.locZ, itemstack);
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
old mode 100644
new mode 100755
index ecfeed9..fce3627
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -151,7 +151,6 @@ public class EntitySheep extends EntityAnimal {
 
                 for (int j = 0; j < i; ++j) {
                     EntityItem entityitem = this.a(new ItemStack(Item.getItemOf(Blocks.WOOL), 1, this.getColor().getColorIndex()), 1.0F);
-
                     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);
@@ -165,6 +164,7 @@ public class EntitySheep extends EntityAnimal {
         return super.a(entityhuman, enumhand, itemstack);
     }
 
+
     public void b(NBTTagCompound nbttagcompound) {
         super.b(nbttagcompound);
         nbttagcompound.setBoolean("Sheared", this.isSheared());
-- 
2.7.0