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

Fixed Armor bar disappear after changing dimension. MC-88179 (#4265)

This commit is contained in:
Vincent Lee 2017-08-01 12:35:03 -05:00 committed by LexManos
parent 00f82331e4
commit 32e811bd7a
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View File

@ -322,7 +322,25 @@
}
this.field_147127_av.func_147690_c();
@@ -2535,159 +2597,8 @@
@@ -2488,6 +2550,17 @@
EntityPlayerSP entityplayersp = this.field_71439_g;
this.field_71439_g = this.field_71442_b.func_192830_a(this.field_71441_e, this.field_71439_g == null ? new StatisticsManager() : this.field_71439_g.func_146107_m(), this.field_71439_g == null ? new RecipeBook() : this.field_71439_g.func_192035_E());
this.field_71439_g.func_184212_Q().func_187218_a(entityplayersp.func_184212_Q().func_187231_c());
+ // Forge - Fix MC-88179 attributes not being copied to new player
+ for (net.minecraft.entity.ai.attributes.IAttributeInstance oldInst : entityplayersp.func_110140_aT().func_111146_a())
+ {
+ net.minecraft.entity.ai.attributes.IAttribute attrib = oldInst.func_111123_a();
+ net.minecraft.entity.ai.attributes.IAttributeInstance newInst = field_71439_g.func_110140_aT().func_111151_a(attrib);
+ newInst.func_111128_a(oldInst.func_111125_b());
+ for (net.minecraft.entity.ai.attributes.AttributeModifier modifier : oldInst.func_111122_c())
+ {
+ newInst.func_111121_a(modifier);
+ }
+ }
this.field_71439_g.field_71093_bK = p_71354_1_;
this.field_175622_Z = this.field_71439_g;
this.field_71439_g.func_70065_x();
@@ -2535,159 +2608,8 @@
{
if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
{
@ -484,7 +502,7 @@
}
}
@@ -3009,18 +2920,8 @@
@@ -3009,18 +2931,8 @@
public static int func_71369_N()
{
@ -505,7 +523,7 @@
}
public boolean func_70002_Q()
@@ -3181,11 +3082,11 @@
@@ -3181,11 +3093,11 @@
{
if (Keyboard.getEventKeyState())
{
@ -519,7 +537,7 @@
{
this.field_71456_v.func_146158_b().func_146227_a(ScreenShotHelper.func_148260_a(this.field_71412_D, this.field_71443_c, this.field_71440_d, this.field_147124_at));
}
@@ -3199,6 +3100,7 @@
@@ -3199,6 +3111,7 @@
}
}
}
@ -527,7 +545,7 @@
}
}
}
@@ -3328,6 +3230,12 @@
@@ -3328,6 +3241,12 @@
return this.field_184127_aH;
}
@ -540,7 +558,7 @@
public boolean func_189648_am()
{
return this.field_71439_g != null && this.field_71439_g.func_175140_cp() || this.field_71474_y.field_178879_v;
@@ -3342,4 +3250,9 @@
@@ -3342,4 +3261,9 @@
{
return this.field_193035_aW;
}