Make Wither Skulls respect Block.canEntityDestroy. Closes #3404

(cherry picked from commit 6b52023a5c341420d976cb50359e2a2a4a6a9192)
This commit is contained in:
LexManos 2016-11-17 12:49:18 -08:00
parent 658769ea45
commit 5ac6d374ed
2 changed files with 15 additions and 3 deletions

View File

@ -208,7 +208,7 @@
public SoundType func_185467_w()
{
return this.field_149762_H;
@@ -908,6 +934,1186 @@
@@ -908,6 +934,1187 @@
{
}
@ -1022,7 +1022,8 @@
+ this != net.minecraft.init.Blocks.field_150411_aY &&
+ this != net.minecraft.init.Blocks.field_185775_db;
+ }
+ else if (entity instanceof net.minecraft.entity.boss.EntityWither)
+ else if ((entity instanceof net.minecraft.entity.boss.EntityWither) ||
+ (entity instanceof net.minecraft.entity.projectile.EntityWitherSkull))
+ {
+ return net.minecraft.entity.boss.EntityWither.func_181033_a(this);
+ }
@ -1395,7 +1396,7 @@
public static void func_149671_p()
{
func_176215_a(0, field_176230_a, (new BlockAir()).func_149663_c("air"));
@@ -1201,14 +2407,7 @@
@@ -1201,14 +2408,7 @@
}
else
{

View File

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.java
+++ ../src-work/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.java
@@ -62,7 +62,7 @@
float f = super.func_180428_a(p_180428_1_, p_180428_2_, p_180428_3_, p_180428_4_);
Block block = p_180428_4_.func_177230_c();
- if (this.func_82342_d() && EntityWither.func_181033_a(block))
+ if (this.func_82342_d() && block.canEntityDestroy(p_180428_4_, p_180428_2_, p_180428_3_, this))
{
f = Math.min(0.8F, f);
}