mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
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
19 lines
1.1 KiB
Diff
19 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
|
Date: Thu, 16 Mar 2023 16:27:50 +0100
|
|
Subject: [PATCH] Fix text display error on spawn
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Display.java b/src/main/java/net/minecraft/world/entity/Display.java
|
|
index bd56721485b3b4ac81c97d60fc2a83bfc20977c0..a658943669cdfd49f66ba713505d11b33306ed86 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Display.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Display.java
|
|
@@ -892,7 +892,7 @@ public abstract class Display extends Entity {
|
|
b = loadFlag(b, nbt, "default_background", (byte)4);
|
|
Optional<Display.TextDisplay.Align> optional = Display.TextDisplay.Align.CODEC
|
|
.decode(NbtOps.INSTANCE, nbt.get("alignment"))
|
|
- .resultOrPartial(Util.prefix("Display entity", Display.LOGGER::error))
|
|
+ .result() // Paper - Hide text display error on spawn
|
|
.map(Pair::getFirst);
|
|
if (optional.isPresent()) {
|
|
b = switch ((Display.TextDisplay.Align)optional.get()) {
|