2022-11-12 18:34:14 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 12 Nov 2022 10:08:58 -0800
Subject: [PATCH] ensure reset EnderDragon boss event name
Fix MC-257487
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
2024-01-19 11:30:04 +00:00
index 02acd171f1d3d783b7cab56c69feca5325878fa8..c298977ae1cac57524b21efcb908b846cbcff6b6 100644
2022-11-12 18:34:14 +00:00
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
2023-08-06 00:21:59 +00:00
@@ -73,6 +73,7 @@ public class EndDragonFight {
2022-11-12 18:34:14 +00:00
private static final int GATEWAY_DISTANCE = 96;
public static final int DRAGON_SPAWN_Y = 128;
2023-06-08 08:47:19 +00:00
private final Predicate<Entity> validPlayer;
2024-01-16 11:41:40 +00:00
+ private static final Component DEFAULT_BOSS_EVENT_NAME = Component.translatable("entity.minecraft.ender_dragon"); // Paper - ensure reset EnderDragon boss event name
2023-08-06 00:21:59 +00:00
public final ServerBossEvent dragonEvent;
2022-11-12 18:34:14 +00:00
public final ServerLevel level;
2023-06-08 08:47:19 +00:00
private final BlockPos origin;
2023-08-06 00:21:59 +00:00
@@ -101,7 +102,7 @@ public class EndDragonFight {
}
public EndDragonFight(ServerLevel world, long gatewaysSeed, EndDragonFight.Data data, BlockPos origin) {
- this.dragonEvent = (ServerBossEvent) (new ServerBossEvent(Component.translatable("entity.minecraft.ender_dragon"), BossEvent.BossBarColor.PINK, BossEvent.BossBarOverlay.PROGRESS)).setPlayBossMusic(true).setCreateWorldFog(true);
2024-01-16 11:41:40 +00:00
+ this.dragonEvent = (ServerBossEvent) (new ServerBossEvent(DEFAULT_BOSS_EVENT_NAME, BossEvent.BossBarColor.PINK, BossEvent.BossBarOverlay.PROGRESS)).setPlayBossMusic(true).setCreateWorldFog(true); // Paper - ensure reset EnderDragon boss event name
2023-08-06 00:21:59 +00:00
this.gateways = new ObjectArrayList();
this.ticksSinceLastPlayerScan = 21;
this.skipArenaLoadedCheck = false;
2023-09-22 15:51:48 +00:00
@@ -503,6 +504,10 @@ public class EndDragonFight {
2022-11-12 18:34:14 +00:00
this.ticksSinceDragonSeen = 0;
if (dragon.hasCustomName()) {
this.dragonEvent.setName(dragon.getDisplayName());
2024-01-16 11:41:40 +00:00
+ // Paper start - ensure reset EnderDragon boss event name
2022-11-12 18:34:14 +00:00
+ } else {
+ this.dragonEvent.setName(DEFAULT_BOSS_EVENT_NAME);
2024-01-16 11:41:40 +00:00
+ // Paper end - ensure reset EnderDragon boss event name
2022-11-12 18:34:14 +00:00
}
}