keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix entity shearing logic (#5566)

Browse source
This commit is contained in:
Ben Staddon 2019-02-25 18:41:37 +00:00 committed by LexManos
parent af717ad788
commit d846f23e80
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
patches/minecraft/net/minecraft/entity/monster/EntitySnowman.java.patch
View file

@ -27,12 +27,17 @@
this.func_184747_a(false); this.func_184747_a(false);
itemstack.func_77972_a(1, p_184645_1_); 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_) { public void func_184724_a(boolean p_184724_1_) {
} }
+ +
+ @Override + @Override
+ public boolean isShearable(ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos) {
+ return this.func_184748_o();
+ }
+
+ @Override
+ public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) { + public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
+ this.func_184747_a(false); + this.func_184747_a(false);
+ return new java.util.ArrayList<>(); + return new java.util.ArrayList<>();

2
patches/minecraft/net/minecraft/entity/passive/EntitySheep.java.patch
View file

@ -34,7 +34,7 @@
+ +
+ @Override + @Override
+ public boolean isShearable(ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos) { + 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 + @Override