aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch
diff options
context:
space:
mode:
authorLulu13022002 <[email protected]>2024-09-21 21:19:02 +0200
committerGitHub <[email protected]>2024-09-21 21:19:02 +0200
commit1ed64f82704c299d0f7ae9af710579be995af8de (patch)
tree8de9a329fed8373ae5eccc59a9ee9558a53ee3fd /patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch
parent593faf4fc3ad433ef523672b6553124dd99f8ca3 (diff)
downloadPaper-1ed64f82704c299d0f7ae9af710579be995af8de.tar.gz
Paper-1ed64f82704c299d0f7ae9af710579be995af8de.zip
Update launchProjectile API (#11300)
Diffstat (limited to 'patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch')
-rw-r--r--patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch
new file mode 100644
index 0000000000..e2a769583d
--- /dev/null
+++ b/patches/server/0762-ensure-reset-EnderDragon-boss-event-name.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+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
+index 98d1c097fdbbc8080624f365634e0812a5eea5ac..bf39f006efef529db697ed4dccbd1657a2673b79 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
+@@ -73,6 +73,7 @@ public class EndDragonFight {
+ private static final int GATEWAY_DISTANCE = 96;
+ public static final int DRAGON_SPAWN_Y = 128;
+ private final Predicate<Entity> validPlayer;
++ private static final Component DEFAULT_BOSS_EVENT_NAME = Component.translatable("entity.minecraft.ender_dragon"); // Paper - ensure reset EnderDragon boss event name
+ public final ServerBossEvent dragonEvent;
+ public final ServerLevel level;
+ private final BlockPos origin;
+@@ -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);
++ 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
+ this.gateways = new ObjectArrayList();
+ this.ticksSinceLastPlayerScan = 21;
+ this.skipArenaLoadedCheck = false;
+@@ -505,6 +506,10 @@ public class EndDragonFight {
+ this.ticksSinceDragonSeen = 0;
+ if (dragon.hasCustomName()) {
+ this.dragonEvent.setName(dragon.getDisplayName());
++ // Paper start - ensure reset EnderDragon boss event name
++ } else {
++ this.dragonEvent.setName(DEFAULT_BOSS_EVENT_NAME);
++ // Paper end - ensure reset EnderDragon boss event name
+ }
+ }
+