mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Allow entity effect changes off the main thread for worldgen (#8942)

Browse source 
* Allow entity effect modification off the main thread for worldgen

* squash all async catcher patches
This commit is contained in:
Jake Potrebic 2023-04-09 11:38:32 -07:00 • committed by GitHub
parent f8c01122e6
commit 6a7fef0e4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
252 changed files with 150 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

19
patches/server/0958-Fix-text-display-error-on-spawn.patch Normal file
View file

@ -0,0 +1,19 @@
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()) {