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

Use null for null resource pack prompts (#6572)

Browse source
This commit is contained in:
thamid-gamer 2021-09-30 20:56:22 -04:00 committed by GitHub
parent 4a27a4a4d9
commit ebfd70b289
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0058-Complete-resource-pack-API.patch
View file

@ -23,7 +23,7 @@ index 22c2c121bbcc7b0e15d73d20c9cc83d5fb085e5f..edb66e8c4507597ec8c35883460f88de
@Override @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/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; @@ -126,6 +126,7 @@ import org.bukkit.metadata.MetadataValue;
@ -66,7 +66,7 @@ index 50cce9e9a67dc2e6722f87b06907b37402158700..90317fef5ebfb44e0f200a75569edfec
+ Validate.notNull(hash, "Hash cannot be null"); + Validate.notNull(hash, "Hash cannot be null");
+ net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ? + net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ?
+ io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) : + io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) :
+ new net.minecraft.network.chat.TextComponent(""); + null;
+ this.getHandle().sendTexturePack(url, hash, required, promptComponent); + this.getHandle().sendTexturePack(url, hash, required, promptComponent);
+ } + }
+ +