From ebfd70b289210c07a0108821447ac3a2104de9e5 Mon Sep 17 00:00:00 2001 From: thamid-gamer <60953955+thamid-gamer@users.noreply.github.com> Date: Thu, 30 Sep 2021 20:56:22 -0400 Subject: [PATCH] Use null for null resource pack prompts (#6572) --- patches/server/0058-Complete-resource-pack-API.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0058-Complete-resource-pack-API.patch b/patches/server/0058-Complete-resource-pack-API.patch index 58f3083700..d92af8df2f 100644 --- a/patches/server/0058-Complete-resource-pack-API.patch +++ b/patches/server/0058-Complete-resource-pack-API.patch @@ -23,7 +23,7 @@ index 22c2c121bbcc7b0e15d73d20c9cc83d5fb085e5f..edb66e8c4507597ec8c35883460f88de @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 50cce9e9a67dc2e6722f87b06907b37402158700..90317fef5ebfb44e0f200a75569edfec7a5d9b1a 100644 +index 50cce9e9a67dc2e6722f87b06907b37402158700..d526d80631088ad80b1fb7e5e3e42e9d8d8d8bcf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -126,6 +126,7 @@ import org.bukkit.metadata.MetadataValue; @@ -66,7 +66,7 @@ index 50cce9e9a67dc2e6722f87b06907b37402158700..90317fef5ebfb44e0f200a75569edfec + Validate.notNull(hash, "Hash cannot be null"); + net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ? + io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) : -+ new net.minecraft.network.chat.TextComponent(""); ++ null; + this.getHandle().sendTexturePack(url, hash, required, promptComponent); + } +