diff options
Diffstat (limited to 'nms-patches/EntitySheep.patch')
-rw-r--r-- | nms-patches/EntitySheep.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/EntitySheep.patch b/nms-patches/EntitySheep.patch index c3ca71f7..c20df343 100644 --- a/nms-patches/EntitySheep.patch +++ b/nms-patches/EntitySheep.patch @@ -12,7 +12,7 @@ + public class EntitySheep extends EntityAnimal { - private static final DataWatcherObject<Byte> bx = DataWatcher.a(EntitySheep.class, DataWatcherRegistry.a); + private static final DataWatcherObject<Byte> bw = DataWatcher.a(EntitySheep.class, DataWatcherRegistry.a); @@ -12,6 +18,13 @@ public boolean a(EntityHuman entityhuman) { return false; @@ -25,8 +25,8 @@ + } + // CraftBukkit end }, 2, 1); - private static final Map<EnumColor, float[]> bz = Maps.newEnumMap(EnumColor.class); - private int bB; + private static final Map<EnumColor, float[]> by = Maps.newEnumMap(EnumColor.class); + private int bA; @@ -26,6 +39,7 @@ this.setSize(0.9F, 1.3F); this.container.setItem(0, new ItemStack(Items.DYE)); @@ -35,9 +35,9 @@ } protected void r() { -@@ -126,11 +140,22 @@ - public boolean a(EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack) { - if (itemstack != null && itemstack.getItem() == Items.SHEARS && !this.isSheared() && !this.isBaby()) { +@@ -128,11 +142,22 @@ + + if (itemstack.getItem() == Items.SHEARS && !this.isSheared() && !this.isBaby()) { if (!this.world.isClientSide) { + // CraftBukkit start + PlayerShearEntityEvent event = new PlayerShearEntityEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), this.getBukkitEntity()); @@ -58,7 +58,7 @@ entityitem.motY += (double) (this.random.nextFloat() * 0.05F); entityitem.motX += (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.1F); -@@ -217,6 +242,12 @@ +@@ -219,6 +244,12 @@ } public void A() { |