OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-02 17:32:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Restore null page behaviour of signed books even though not strictly allowed by API

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2024-05-10 19:08:54 +10:00
parent e01dc013f7
commit 17b4c0d7a3
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
View file

@ -212,7 +212,7 @@ public class CraftMetaBookSigned extends CraftMetaItem implements BookMeta {
// assert: pages != null
String newText = validatePage(text);
pages.set(page - 1, CraftChatMessage.fromStringOrNull(newText, true));
pages.set(page - 1, CraftChatMessage.fromStringOrEmpty(newText, true));
}
@Override
@ -224,7 +224,7 @@ public class CraftMetaBookSigned extends CraftMetaItem implements BookMeta {
public void addPage(final String... pages) {
for (String page : pages) {
page = validatePage(page);
internalAddPage(CraftChatMessage.fromStringOrNull(page, true));
internalAddPage(CraftChatMessage.fromStringOrEmpty(page, true));
}
}

8
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
View file

@ -177,6 +177,14 @@ public final class CraftChatMessage {
return (message == null || message.isEmpty()) ? null : fromString(message, keepNewlines)[0];
}
public static IChatBaseComponent fromStringOrEmpty(String message) {
return fromStringOrEmpty(message, false);
}
public static IChatBaseComponent fromStringOrEmpty(String message, boolean keepNewlines) {
return fromString(message, keepNewlines)[0];
}
public static IChatBaseComponent[] fromString(String message) {
return fromString(message, false);
}