From d9dbec05463cff111268a26dbe136a09ac6beb0c Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Sun, 15 Apr 2018 03:43:45 +0100 Subject: [PATCH] Fix dragon fight not initialising correctly under some circumstances (#4868) --- .../world/end/DragonFightManager.java.patch | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/end/DragonFightManager.java.patch b/patches/minecraft/net/minecraft/world/end/DragonFightManager.java.patch index a1e5b7b78..1232aa902 100644 --- a/patches/minecraft/net/minecraft/world/end/DragonFightManager.java.patch +++ b/patches/minecraft/net/minecraft/world/end/DragonFightManager.java.patch @@ -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 @@ } } }