Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3ea95ef Do not access world state to see if we can see a Player
PaperMC/Paper@71c84c8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
PaperMC/Paper@e3bc4c4 Make debug mode print current configuration phase
PaperMC/Paper@d0ebfbb Fix corrupted plugin.yml breaking plugin loading (#10279)
PaperMC/Paper@681bbff Fix spawnreason saving
PaperMC/Paper@850b736 Close PRs opened from orgs or bot accounts (#10281)
PaperMC/Paper@54a2340 check if itemstack is stackable first (#10285)
PaperMC/Paper@9c4bb0d add rich message component support to configuration (#10225)
PaperMC/Paper@8870d22 Fire EntityDamageByEntityEvent for unowned wither skulls patch (#10244)
PaperMC/Paper@bbc03d8 improve BanList types (#10239)
PaperMC/Paper@ce5c8dd Configurable max block/fluid ticks (#10266)
PaperMC/Paper@880fef7 Deprecate extra ban methods with raw BanEntry (#9580)
PaperMC/Paper@60218cd Don't tick empty worlds (#9025)
PaperMC/Paper@b21eb4d add overloads to use suspicious effect entry to mushroom cow and suspicious stew meta (#10245)
PaperMC/Paper@89d51d5 Allow enabling sand duping (#10191)
PaperMC/Paper@6ad63fb Per world ticks per spawn settings (#6891)
PaperMC/Paper@0052e2d build: Update tiny-remapper to 0.10.1 & remove unused repo from dev bundle config (#10303)
PaperMC/Paper@a0931f4 Updated Upstream (Bukkit/CraftBukkit) (#10301)
PaperMC/Paper@80e1a45 Add param to overrides to the correct method is called (#10308)
PaperMC/Paper@62b220a Allow passenger retaining teleport via end gateway (#10283)
PaperMC/Paper@ab1afb0 Fix missing profiler.pop() in PathFinder::findPath (#10320)
PaperMC/Paper@cd110a8 [ci skip] Update CONTRIBUTING.md (#10318)
PaperMC/Paper@e603486 Add onboarding message for initial server start (#10312)
PaperMC/Paper@d361a7f Fix DamageSource API (#10307)
PaperMC/Paper@99a6416 Expand Hopper BlockState API (#10328)
PaperMC/Paper@09d6dfb [ci skip] Upstream dependencies in workflow scripts. (#10338)
PaperMC/Paper@55ffcb1 Fix tripwire disarming not working as intended
PaperMC/Paper@05fe15e Fire EntityChangeBlockEvent on beehive nectar deposit (#10306)
PaperMC/Paper@de620b8 Clone mutable types in events when changes are discarded (#10333)
PaperMC/Paper@41ffa0c Expose power on fireballs (#10302)
PaperMC/Paper@88419b2 Do not copy profile data if profiles are the same (#10259)
PaperMC/Paper@9ec7dfc Move invisible setting up to entities (#10346)
PaperMC/Paper@b600140 Add methods to change entity physics (#10334)
PaperMC/Paper@00fd87a Return dummy string instead of empty optional
PaperMC/Paper@710dced [ci skip] move custom brig exception to paper package
PaperMC/Paper@45d1486 build: Update paperweight to 1.5.12 and Gradle Wrapper to 8.7 (#10361)
PaperMC/Paper@e709245 Add config option for tripwire disarming fix
PaperMC/Paper@a203544 build: Compile against and shade the filtered jar (#9747)
PaperMC/Paper@bd38e03 Updated Upstream (Bukkit/CraftBukkit) (#10379)
PaperMC/Paper@a774fba feat: Entity#teleportAsync method with TeleportFlags (#10371)
PaperMC/Paper@06361fa Fix invalid block entities created during world gen (#10375)
PaperMC/Paper@bbee11f Deprecate Bukkit#getLogger (#10388)
PaperMC/Paper@d8456ee Don't throw NPE for unplaced blockstate on #getDrops (#10366)
PaperMC/Paper@182e79b Add more item use API (#10304)
PaperMC/Paper@acf838f Backport some stuff from the generators branch (#10365)
PaperMC/Paper@3d31e45 Add BlockBreakProgressUpdateEvent (#10300)
PaperMC/Paper@8e75001 Disable vertical air friction when item entities have friction disabled (#10369)
PaperMC/Paper@241d8e2 Ignore minecart in activation range (#10359)
PaperMC/Paper@1207162 Allow player-list API to self un/list (#10358)
PaperMC/Paper@5436d44 Deprecate several Keyed#getKey methods (#10357)
PaperMC/Paper@a7f1dc6 Change online mode default for Velocity configuration (#10413)
PaperMC/Paper@37db2d7 [ci skip] Update book page/char limit for book meta doc (#10415)
PaperMC/Paper@526795b Update patches to handle vineflower decompiler (#10406)
PaperMC/Paper@8fe90de [ci skip] Referenced InventoryDragEvent in documentation of InventoryClickEvent (#10395)
PaperMC/Paper@46d462b Fix StackOverflowException thrown on shutdown (Fixes #10404) (#10408)
PaperMC/Paper@f061e76 Fix hit criteria advancement triggered before changing state (#10409)
PaperMC/Paper@3263470 Add color transition and clone functions to ParticleBuilder (#10342)
PaperMC/Paper@4445d23 Deprecate ItemStack#setType & add ItemStack#withType (#10290)
PaperMC/Paper@862299b "Downgrade" Vineflower to 1.10.1 release (#10423)
PaperMC/Paper@9e886c4 Remove dead code (LegacyResult) (#10411)
PaperMC/Paper@3b078f8 Add API for ticking fluids (#10435)
PaperMC/Paper@908b814 Fix inventory desync with PlayerLeashEntityEvent (#10436)
PaperMC/Paper@3af1346 Allow setting player list name early
PaperMC/Paper@a033033 Added chunk view API (#10398)
PaperMC/Paper@c5f68ff Add CartographyItemEvent and get/setResult for CartographyInventory (#10396)
PaperMC/Paper@fc53ff5 Add Configuration for finding Structures outside World Border (#10437)
PaperMC/Paper@a6b6ecd More Raid API (#7537)
PaperMC/Paper@f4c7d37 [ci skip] Fix javadoc typo (#10445)
PaperMC/Paper@53d10b8 Adjust large packet handler to run when above protocol limit
PaperMC/Paper@7ac24a1 Fix chunk data version check not running in chunk system

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("java-library")
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.11"
+    id("io.papermc.paperweight.patcher") version "1.5.15"
 }
 
 repositories {
@@ -12,8 +12,8 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.10:fat")
-    decompiler("net.minecraftforge:forgeflower:2.0.627.2")
+    remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
+    decompiler("org.vineflower:vineflower:1.10.1")
     paperclip("io.papermc:paperclip:3.0.3")
 }
 

gradle.properties

@@ -3,7 +3,7 @@ version = 1.20.4-R0.1-SNAPSHOT
 
 mcVersion = 1.20.4
 packageVersion = 1_20_R3
-paperRef = 4939f8711884901ddf1c56337f606de71cdae78d
+paperRef = 7ac24a18940da12beb39a030113f6e459f348e2f
 
 org.gradle.jvmargs = -Xmx2G
 

patches/api/0001-Pufferfish-api-patches.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Pufferfish api patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index bf01892c248b988531d21d9fb0f74d0adf2205ac..e58933f5c8284971d81728932b95c05b5201983b 100644
+index 04853c43b99951bf0d4c96ef73724625bdaf018f..7a80637b31ed082e1506d9fb45ab8141abf79f73 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -75,6 +75,8 @@ dependencies {
      testImplementation("org.hamcrest:hamcrest:2.2")
-     testImplementation("org.mockito:mockito-core:5.5.0")
-     testImplementation("org.ow2.asm:asm-tree:9.5")
+     testImplementation("org.mockito:mockito-core:5.11.0")
+     testImplementation("org.ow2.asm:asm-tree:9.7")
 +
 +    api("io.sentry:sentry:5.4.0") // Pufferfish
  }
@@ -462,7 +462,7 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..6efa6732e5559c3192d08b8631911be7
 
              if (cloader instanceof PluginClassLoader) {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index f9b57b872780aa6b9b959494874b57c7a8ff0c53..90953bfc81168068a281be4d2d3942d5e7dd69ff 100644
+index 7e4f7cb2afbc145e532285c793573ad107bc3033..12449e18180d604e9cbbc744da74a8b222a18e1f 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -50,6 +50,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm

patches/api/0002-Add-CloudPlane-configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add CloudPlane configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b4f8281d3797ec825a7671f38077cd65d5a1d76e..0fc4abda46c6abdb81f67ff2dc39359c0e004364 100644
+index 4ff1b38eb65f97344257204cf018f176f247ed36..04b40ad207b220ca01d8bcf0f779b7e15be4e706 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2214,6 +2214,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2235,6 +2235,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

patches/server/0001-Optimize-non-flush-packet-sending.patch

@@ -27,7 +27,7 @@ runnables on the event loop.
 Co-authored-by: booky10 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 4716f8bd8a64d4f20f0d5957c1e7fabf63020f43..8695b0f7b02c3001947c81b6f57680a3f7325787 100644
+index a536ebcf29d8ef0ed32863bd8d5e70f7a0636e8d..ec09fae7ba11617da9fb0cff007b21d3673dcf86 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -60,6 +60,21 @@ import org.slf4j.MarkerFactory;
@@ -52,7 +52,7 @@ index 4716f8bd8a64d4f20f0d5957c1e7fabf63020f43..8695b0f7b02c3001947c81b6f57680a3
      private static final float AVERAGE_PACKETS_SMOOTHING = 0.75F;
      private static final Logger LOGGER = LogUtils.getLogger();
      public static final Marker ROOT_MARKER = MarkerFactory.getMarker("NETWORK");
-@@ -429,9 +444,24 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -430,9 +445,24 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          if (this.channel.eventLoop().inEventLoop()) {
              this.doSendPacket(packet, callbacks, flush);
          } else {

patches/server/0003-Change-branding.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Change branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c3575658207faf8ea835de1bbcb4605cf2381117..55d1da6fa402f2ffc6f747196d407060176f3bb7 100644
+index eeea33edcfcf3ee4165d77cae22b407d6bcfeb58..01be207327f99c9eecd1989d57a1de786cb1ff22 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -21,7 +21,7 @@ index c3575658207faf8ea835de1bbcb4605cf2381117..55d1da6fa402f2ffc6f747196d407060
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -86,7 +88,7 @@ tasks.jar {
+@@ -87,7 +89,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -105,10 +105,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..b650f1f7390374dd50b0a281441d0ddb
                  org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 91eb7d831db2e6c2b7e259151503afbf3c8aa8e0..6018901e7ac605dfc088df55ab9ca38bdb654f01 100644
+index d25b8197e6b02ec6c5cd3aca4a2630a2f98ef60b..a581ba78433522a22be95d9e7e4d1be803aa61e0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1857,7 +1857,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1867,7 +1867,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {
@@ -118,7 +118,7 @@ index 91eb7d831db2e6c2b7e259151503afbf3c8aa8e0..6018901e7ac605dfc088df55ab9ca38b
 
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4b4449fbdb2ff58f2bc85831b7c5c5eb0deac21a..1eeaf3ac76a3dc8b559fb4629a0283b012211388 100644
+index 4e5374c06858b2a03735c5fb0675e088d3646973..31f7ed380148f7d08b2267b514849989f37478fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
@@ -131,7 +131,7 @@ index 4b4449fbdb2ff58f2bc85831b7c5c5eb0deac21a..1eeaf3ac76a3dc8b559fb4629a0283b0
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ce341f42b3a5e17fb6d1f7de8057e73137ae2a6e..2440847cc6e7a05d2438f51557a71a2fcd4b24e2 100644
+index 8d626fadcd4743b6472a2954d2b1b2ec89669814..1ba255a9ece97b05bbb2afbc0dab505b4d9b3fd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -301,7 +301,7 @@ public class Main {

patches/server/0004-Add-CloudPlane-configuration.patch

@@ -225,10 +225,10 @@ index 78e4675113ff2189a7bf3d418fe4adb21f6e6c37..3e875fb6e547812995f4efbb3509fe04
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fa3ca8d83c247d6023736721e2632cca2702b99f..d31e41127959e448f2f3c735673f02863d7b9cab 100644
+index 1b74ffe050197dc96128b520c1f3644f11b67e6d..916a2ce18a8809d13ccb78c294aee63054f511fd 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -220,10 +220,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -229,10 +229,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      private final int height;
      private final int maxBuildHeight;
      // Pufferfish end
@@ -242,7 +242,7 @@ index fa3ca8d83c247d6023736721e2632cca2702b99f..d31e41127959e448f2f3c735673f0286
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1eeaf3ac76a3dc8b559fb4629a0283b012211388..47deae9cb5c9a9350bfef89c9a55878c010b6a8d 100644
+index 31f7ed380148f7d08b2267b514849989f37478fd..8972630f5216dded8374aaaae38e220eec22ddb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1054,6 +1054,7 @@ public final class CraftServer implements Server {
@@ -253,7 +253,7 @@ index 1eeaf3ac76a3dc8b559fb4629a0283b012211388..47deae9cb5c9a9350bfef89c9a55878c
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -3018,6 +3019,13 @@ public final class CraftServer implements Server {
+@@ -3033,6 +3034,13 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
 
@@ -268,7 +268,7 @@ index 1eeaf3ac76a3dc8b559fb4629a0283b012211388..47deae9cb5c9a9350bfef89c9a55878c
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2440847cc6e7a05d2438f51557a71a2fcd4b24e2..0130571c45f072dcb3100ae6992e3ed0ed754cf3 100644
+index 1ba255a9ece97b05bbb2afbc0dab505b4d9b3fd7..c0f6b5d092fbd60f8e33e947495e329e350e0b5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -174,6 +174,14 @@ public class Main {

patches/server/0007-Add-more-detailed-brand-info.patch

@@ -25,10 +25,10 @@ index b21f7a41581ddf36d61e206366c6398738a47813..9d3dafc4989b9fbaa32a337df9b3c56e
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-index 76f31845fe50200d09e5ab6a6c08da00444414ad..9e0388a6fc638db8be3f6fed73bbbf84a045b813 100644
+index 87c5690774363edc1b7ebff10b041e48c0a6d56d..9892ab8a32f5182376daf850ddad6f276fabb6ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-@@ -67,7 +67,12 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
+@@ -71,7 +71,12 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
      }
 
      public void startConfiguration() {
@@ -43,7 +43,7 @@ index 76f31845fe50200d09e5ab6a6c08da00444414ad..9e0388a6fc638db8be3f6fed73bbbf84
 
          this.send(new ClientboundUpdateEnabledFeaturesPacket(FeatureFlags.REGISTRY.toNames(this.server.getWorldData().enabledFeatures())));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 47deae9cb5c9a9350bfef89c9a55878c010b6a8d..1ebb1da427e8d9b3e2ca4984b288c1bb6a02d528 100644
+index 8972630f5216dded8374aaaae38e220eec22ddb6..0f1bb23df82ff871112afb1e28d5afd2b7ab8ada 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -267,7 +267,7 @@ import javax.annotation.Nonnull; // Paper

patches/server/0009-Fire-PlayerPickupArrowEvent-for-creative-players.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fire PlayerPickupArrowEvent for creative players
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index d14eab0d83d629a4522bf3f7d789d2853eb84f06..645ce347af20aa970d11cb61bbfbdd8a31e6b055 100644
+index e8faca6e443239968f0111519f9e5cd018ed3297..262a109fac2e2b518da1d972ba87a22a14424018 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -584,7 +584,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -585,7 +585,7 @@ public abstract class AbstractArrow extends Projectile {
          if (!this.level().isClientSide && (this.inGround || this.isNoPhysics()) && this.shakeTime <= 0) {
              // CraftBukkit start
              ItemStack itemstack = this.getPickupItem();

patches/server/0013-Resend-more-data-on-locale-change.patch

@@ -27,7 +27,7 @@ index 24e5993b281448734eb67c7a8439a349bbf9fd72..1e3864d864dc2e10e3c19ea1aae6d0e3
          this.player = owner;
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 881e893878a7d3b17ae272bbf25ff7dc53dc8c9a..1f06a468a54aa0068fbe1f4831133d58b325e00a 100644
+index a4ad8210bf399ccbaedd9c4d49bd73255bc750b7..caaba158f048abaceabbde6d296fbeda47341f2b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -329,6 +329,10 @@ public class ServerPlayer extends Player {
@@ -77,23 +77,23 @@ index 881e893878a7d3b17ae272bbf25ff7dc53dc8c9a..1f06a468a54aa0068fbe1f4831133d58
          // CraftBukkit end
          // Paper start - don't call options events on login
 diff --git a/src/main/java/net/minecraft/world/entity/Display.java b/src/main/java/net/minecraft/world/entity/Display.java
-index 2ecd3ed5b36475125c6f63af2612011fc8fba8a5..1cb2532bad5b30366a743000318bcbafb23e9e87 100644
+index bba45aa7ba4fa578344ec2b9dfa552097770a59f..87b217ae527005ddf3aa77f5b874263261c6f20c 100644
 --- a/src/main/java/net/minecraft/world/entity/Display.java
 +++ b/src/main/java/net/minecraft/world/entity/Display.java
-@@ -768,7 +768,7 @@ public abstract class Display extends Entity {
+@@ -798,7 +798,7 @@ public abstract class Display extends Entity {
          public static final byte FLAG_ALIGN_RIGHT = 16;
          private static final byte INITIAL_TEXT_OPACITY = -1;
          public static final int INITIAL_BACKGROUND = 1073741824;
 -        private static final EntityDataAccessor<Component> DATA_TEXT_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.COMPONENT);
 +        public static final EntityDataAccessor<Component> DATA_TEXT_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.COMPONENT); // CloudPlane - private -> public
          public static final EntityDataAccessor<Integer> DATA_LINE_WIDTH_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.INT);
-         public static final EntityDataAccessor<Integer> DATA_BACKGROUND_COLOR_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.INT);
-         private static final EntityDataAccessor<Byte> DATA_TEXT_OPACITY_ID = SynchedEntityData.defineId(Display.TextDisplay.class, EntityDataSerializers.BYTE);
+         public static final EntityDataAccessor<Integer> DATA_BACKGROUND_COLOR_ID = SynchedEntityData.defineId(
+             Display.TextDisplay.class, EntityDataSerializers.INT
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 734e792451d878aba40f287bd21203a176366b01..8487cfe34a72d1750f0abc4a76f859d3fcb9a49d 100644
+index e45b1c4a23f0793efec704e969f10ca1105b3098..dc52c388b72d2d378be4de7bd0e35d76ae6b21dc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -357,7 +357,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -358,7 +358,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      protected static final int FLAG_GLOWING = 6;
      protected static final int FLAG_FALL_FLYING = 7;
      private static final EntityDataAccessor<Integer> DATA_AIR_SUPPLY_ID = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.INT);