Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
md_5 2024-05-10 19:08:54 +10:00
parent 6118e5398a
commit 66f1f439aa
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

8
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]; 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) { public static IChatBaseComponent[] fromString(String message) {
return fromString(message, false); return fromString(message, false);
} }