Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
bffb08c2f9
The Paper method was chosen for deprecation because it was more restrictive in that it has an isGliding check.
40 Zeilen
2.2 KiB
Diff
40 Zeilen
2.2 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 44f799d595d7150f00dfdfa2f85c87386f896607..390542c42fe957e8e2d21c879c1c8908c8970b44 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
|
|
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
|
|
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 - reset to default name
|
|
+ } else {
|
|
+ this.dragonEvent.setName(DEFAULT_BOSS_EVENT_NAME);
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|