Fix dragon fight not initialising correctly under some circumstances (#4868)

This commit is contained in:
Ben Staddon 2018-04-15 03:43:45 +01:00 committed by LexManos
parent 32237f57ef
commit d9dbec0546
1 changed files with 15 additions and 7 deletions

View File

@ -1,14 +1,22 @@
--- ../src-base/minecraft/net/minecraft/world/end/DragonFightManager.java
+++ ../src-work/minecraft/net/minecraft/world/end/DragonFightManager.java
@@ -72,6 +72,7 @@
public DragonFightManager(WorldServer p_i46669_1_, NBTTagCompound p_i46669_2_)
{
this.field_186110_d = p_i46669_1_;
+ this.field_186120_n = p_i46669_2_.func_82582_d(); // Forge: fix MC-105080
@@ -82,6 +82,7 @@
if (p_i46669_2_.func_150297_b("DragonKilled", 99))
this.field_186117_k = p_i46669_2_.func_74767_n("DragonKilled");
this.field_186118_l = p_i46669_2_.func_74767_n("PreviouslyKilled");
+ this.field_186120_n = !p_i46669_2_.func_74767_n("LegacyScanPerformed"); // Forge: fix MC-105080
if (p_i46669_2_.func_74767_n("IsRespawning"))
{
@@ -128,6 +129,7 @@
nbttagcompound.func_74757_a("DragonKilled", this.field_186117_k);
nbttagcompound.func_74757_a("PreviouslyKilled", this.field_186118_l);
+ nbttagcompound.func_74757_a("LegacyScanPerformed", !this.field_186120_n); // Forge: fix MC-105080
if (this.field_186121_o != null)
{
@@ -582,4 +583,14 @@
@@ -582,4 +584,14 @@
}
}
}