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

Fix invulnerable items becoming invisible client side MC-53850 (#3807)

Browse source
This commit is contained in:
PhiPro95 2017-04-08 02:03:43 +02:00 committed by LexManos
parent dbc6baf2f7
commit 5f4cd69167
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch
View file

@ -57,7 +57,15 @@
else
{
itemstack1.func_190917_f(itemstack.func_190916_E());
@@ -316,6 +335,7 @@
@@ -284,6 +303,7 @@
public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_)
{
+ if (this.field_70170_p.field_72995_K || this.field_70128_L) return false; //Forge: Fixes MC-53850
if (this.func_180431_b(p_70097_1_))
{
return false;
@@ -316,6 +336,7 @@
p_70014_1_.func_74777_a("Health", (short)this.field_70291_e);
p_70014_1_.func_74777_a("Age", (short)this.field_70292_b);
p_70014_1_.func_74777_a("PickupDelay", (short)this.field_145804_b);
@ -65,7 +73,7 @@
if (this.func_145800_j() != null)
{
@@ -360,17 +380,22 @@
@@ -360,17 +381,22 @@
{
this.func_70106_y();
}
@ -89,7 +97,7 @@
{
if (item == Item.func_150898_a(Blocks.field_150364_r))
{
@@ -407,6 +432,7 @@
@@ -407,6 +433,7 @@
}
}
@ -97,7 +105,7 @@
p_70100_1_.func_71001_a(this, i);
if (itemstack.func_190926_b())
@@ -513,6 +539,6 @@
@@ -513,6 +540,6 @@
public void func_174870_v()
{
this.func_174871_r();

10
patches/minecraft/net/minecraft/entity/item/EntityXPOrb.java.patch
View file

@ -1,6 +1,14 @@
--- ../src-base/minecraft/net/minecraft/entity/item/EntityXPOrb.java
+++ ../src-work/minecraft/net/minecraft/entity/item/EntityXPOrb.java
@@ -208,6 +208,7 @@
@@ -170,6 +170,7 @@
public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_)
{
+ if (this.field_70170_p.field_72995_K || this.field_70128_L) return false; //Forge: Fixes MC-53850
if (this.func_180431_b(p_70097_1_))
{
return false;
@@ -208,6 +209,7 @@
{
if (this.field_70532_c == 0 && p_70100_1_.field_71090_bL == 0)
{