2022-11-12 19:34:14 +01: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-08-31 20:29:50 +02:00
index 98d1c097fdbbc8080624f365634e0812a5eea5ac..bf39f006efef529db697ed4dccbd1657a2673b79 100644
2022-11-12 19:34:14 +01: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 02:21:59 +02:00
@@ -73,6 +73,7 @@ public class EndDragonFight {
2022-11-12 19:34:14 +01:00
private static final int GATEWAY_DISTANCE = 96;
public static final int DRAGON_SPAWN_Y = 128;
2023-06-08 10:47:19 +02:00
private final Predicate<Entity> validPlayer;
2024-01-16 12:41:40 +01: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 02:21:59 +02:00
public final ServerBossEvent dragonEvent;
2022-11-12 19:34:14 +01:00
public final ServerLevel level;
2023-06-08 10:47:19 +02:00
private final BlockPos origin;
2023-08-06 02:21:59 +02: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 12:41:40 +01: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 02:21:59 +02:00
this.gateways = new ObjectArrayList();
this.ticksSinceLastPlayerScan = 21;
this.skipArenaLoadedCheck = false;
2024-08-16 21:45:07 +02:00
@@ -505,6 +506,10 @@ public class EndDragonFight {
2022-11-12 19:34:14 +01:00
this.ticksSinceDragonSeen = 0;
if (dragon.hasCustomName()) {
this.dragonEvent.setName(dragon.getDisplayName());
2024-01-16 12:41:40 +01:00
+ // Paper start - ensure reset EnderDragon boss event name
2022-11-12 19:34:14 +01:00
+ } else {
+ this.dragonEvent.setName(DEFAULT_BOSS_EVENT_NAME);
2024-01-16 12:41:40 +01:00
+ // Paper end - ensure reset EnderDragon boss event name
2022-11-12 19:34:14 +01:00
}
}