mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: elmital <54907162+elmital@users.noreply.github.com>
|
|
Date: Fri, 16 Sep 2022 17:44:34 +0200
|
|
Subject: [PATCH] Fix: EndDragonFight killed statuses should be false for newly
|
|
created worlds
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
|
|
index f8d846345c1cc3c78f9ac14635b26f2affc77190..c36a543f091447ad50beb71741de3301e4fb81e3 100644
|
|
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
|
|
+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
|
|
@@ -112,9 +112,11 @@ public class EndDragonFight {
|
|
if (nbt.contains("ExitPortalLocation", 10)) {
|
|
this.portalLocation = NbtUtils.readBlockPos(nbt.getCompound("ExitPortalLocation"));
|
|
}
|
|
- } else {
|
|
- this.dragonKilled = true;
|
|
- this.previouslyKilled = true;
|
|
+ // Paper start - Killed statuses should be false for newly created worlds
|
|
+ // } else {
|
|
+ // this.dragonKilled = true;
|
|
+ // this.previouslyKilled = true;
|
|
+ // Paper end
|
|
}
|
|
|
|
if (nbt.contains("Gateways", 9)) {
|