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

Fix capabilities becoming inaccessible on returning from end (#6368)

Browse source
This commit is contained in:
Richard Freimer 2019-12-18 23:40:36 -05:00 committed by LexManos
parent 747cb0f151
commit 47a1f7529a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
patches/minecraft/net/minecraft/entity/player/ServerPlayerEntity.java.patch
View file

@ -8,7 +8,7 @@
boolean flag = this.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223609_l); boolean flag = this.field_70170_p.func_82736_K().func_223586_b(GameRules.field_223609_l);
if (flag) { if (flag) {
ITextComponent itextcomponent = this.func_110142_aN().func_151521_b(); ITextComponent itextcomponent = this.func_110142_aN().func_151521_b();
@@ -550,8 +551,10 @@ @@ -550,13 +551,15 @@
return this.field_71133_b.func_71219_W(); return this.field_71133_b.func_71219_W();
} }
@ -19,6 +19,12 @@
this.field_184851_cj = true; this.field_184851_cj = true;
DimensionType dimensiontype = this.field_71093_bK; DimensionType dimensiontype = this.field_71093_bK;
if (dimensiontype == DimensionType.field_223229_c_ && p_212321_1_ == DimensionType.field_223227_a_) { if (dimensiontype == DimensionType.field_223229_c_ && p_212321_1_ == DimensionType.field_223227_a_) {
this.func_213319_R();
- this.func_71121_q().func_217434_e(this);
+ this.func_71121_q().removePlayer(this, true); //Forge: The player entity is cloned so keep the data until after cloning calls copyFrom
if (!this.field_71136_j) {
this.field_71136_j = true;
this.field_71135_a.func_147359_a(new SChangeGameStatePacket(4, this.field_192040_cp ? 0.0F : 1.0F));
@@ -569,12 +572,13 @@ @@ -569,12 +572,13 @@
this.field_71093_bK = p_212321_1_; this.field_71093_bK = p_212321_1_;
ServerWorld serverworld1 = this.field_71133_b.func_71218_a(p_212321_1_); ServerWorld serverworld1 = this.field_71133_b.func_71218_a(p_212321_1_);