dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
40 Zeilen
2.4 KiB
Diff
40 Zeilen
2.4 KiB
Diff
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
|
|
index b8bba857aa390e5435b8a199a25065a940d6a972..f6f5fad52e41d5ccc37dc28c40904fce014907fb 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;
|
|
@@ -503,6 +504,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
|
|
}
|
|
}
|
|
|