From d846f23e809badea763a9471fd1bd8892f99f10f Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Mon, 25 Feb 2019 18:41:37 +0000 Subject: [PATCH] Fix entity shearing logic (#5566) --- .../net/minecraft/entity/monster/EntitySnowman.java.patch | 7 ++++++- .../net/minecraft/entity/passive/EntitySheep.java.patch | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.java.patch b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.java.patch index a20e07f789..6827b5aa6f 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.java.patch +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.java.patch @@ -27,12 +27,17 @@ this.func_184747_a(false); itemstack.func_77972_a(1, p_184645_1_); } -@@ -166,4 +166,10 @@ +@@ -166,4 +166,15 @@ public void func_184724_a(boolean p_184724_1_) { } + + @Override ++ public boolean isShearable(ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos) { ++ return this.func_184748_o(); ++ } ++ ++ @Override + public java.util.List onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) { + this.func_184747_a(false); + return new java.util.ArrayList<>(); diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch index 857f675259..7df6732c01 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch @@ -34,7 +34,7 @@ + + @Override + public boolean isShearable(ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos) { -+ return !this.func_70631_g_(); ++ return !this.func_70892_o() && !this.func_70631_g_(); + } + + @Override