mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-18 10:04:49 +02:00
38be4f873b
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2c64d8c4 SPIGOT-7309: Add API for jukebox inventories a6d7e4ca PR-826: Add Sniffer API CraftBukkit Changes: 93813509b SPIGOT-7309: Add API for jukebox inventories 2d5209e8d PR-1153: Handle teleport reason in spreadplayers command f5b61387e SPIGOT-7308: Fix NullPointerException when calling Jukebox#setRecord() 388d458a6 SPIGOT-7306: Fix reset of coords in default teleportTo in EntityPlayer 40b87e1af PR-1150: Add Sniffer API and handle EntityItemDropEvent Spigot Changes: 6ad4b93c SPIGOT-7298: Fix debug stick always permission left click toggle
20 lines
1.3 KiB
Diff
20 lines
1.3 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 78c73e5d2d62998518f43bf0e7eaedebd65bab01..a0b556ea2dd6365ad497825fd9c090001a047099 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Display.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Display.java
|
|
@@ -827,7 +827,7 @@ public abstract class Display extends Entity {
|
|
byte b = loadFlag((byte)0, nbt, "shadow", (byte)1);
|
|
b = loadFlag(b, nbt, "see_through", (byte)2);
|
|
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)).map(Pair::getFirst);
|
|
+ Optional<Display.TextDisplay.Align> optional = Display.TextDisplay.Align.CODEC.decode(NbtOps.INSTANCE, nbt.get("alignment")).result().map(Pair::getFirst); // Paper
|
|
if (optional.isPresent()) {
|
|
byte var10000;
|
|
switch ((Display.TextDisplay.Align)optional.get()) {
|