From aac07a271cd8aa546cb056c31d692869cd324790 Mon Sep 17 00:00:00 2001 From: CDFN Date: Sat, 16 Jan 2021 20:10:42 +0100 Subject: [PATCH] Return chat component with empty text instead of throwing exception. Fixes #3328 Signed-off-by: MiniDigger --- ...onent-with-empty-text-instead-of-thr.patch | 20 +++++++++++++++ ...onent-with-empty-text-instead-of-thr.patch | 25 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 Spigot-API-Patches/0261-Return-chat-component-with-empty-text-instead-of-thr.patch create mode 100644 Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/Spigot-API-Patches/0261-Return-chat-component-with-empty-text-instead-of-thr.patch b/Spigot-API-Patches/0261-Return-chat-component-with-empty-text-instead-of-thr.patch new file mode 100644 index 0000000000..39d9886e96 --- /dev/null +++ b/Spigot-API-Patches/0261-Return-chat-component-with-empty-text-instead-of-thr.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: CDFN +Date: Tue, 7 Jul 2020 17:53:23 +0200 +Subject: [PATCH] Return chat component with empty text instead of throwing + exception + + +diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java +index 14346d83bc99581b18e53d19af03708c0bf22cf7..2d0a12d3f0603ba06db3f3216faa720445a286a7 100644 +--- a/src/main/java/org/bukkit/inventory/InventoryView.java ++++ b/src/main/java/org/bukkit/inventory/InventoryView.java +@@ -449,7 +449,7 @@ public abstract class InventoryView { + /** + * Get the title of this inventory window. + * +- * @return The title. ++ * @return The title or empty string when title is {@code null}. + */ + @NotNull + public abstract String getTitle(); diff --git a/Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch b/Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch new file mode 100644 index 0000000000..f80c27dec5 --- /dev/null +++ b/Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: CDFN +Date: Tue, 7 Jul 2020 17:53:23 +0200 +Subject: [PATCH] Return chat component with empty text instead of throwing + exception + + +diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java +index 1eba0ccad798ee0d9e9d573e58a8dcd5363b6ffd..3de58cd344c37451873aa8a12b5d9e65f390ec8f 100644 +--- a/src/main/java/net/minecraft/server/Container.java ++++ b/src/main/java/net/minecraft/server/Container.java +@@ -45,7 +45,12 @@ public abstract class Container { + } + private IChatBaseComponent title; + public final IChatBaseComponent getTitle() { +- Preconditions.checkState(this.title != null, "Title not set"); ++ // Paper start - return chat component with empty text instead of throwing error ++ // Preconditions.checkState(this.title != null, "Title not set"); ++ if(this.title == null){ ++ return new ChatComponentText(""); ++ } ++ // Paper end + return this.title; + } + public final void setTitle(IChatBaseComponent title) {