SPIGOT-6006: Increase item text length limits

This commit is contained in:
md_5 2020-07-19 08:47:03 +10:00
parent d4cbb64430
commit 05090020ed
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11

View file

@ -1,4 +1,4 @@
From 0c9afcd065d73db1288f2576748fc895c7d18d0d Mon Sep 17 00:00:00 2001
From 27abbde5ea24d638e0cf2657d1f6b227f8505e2e Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 2 Jul 2014 23:35:51 +0100
Subject: [PATCH] Better item validation
@ -20,7 +20,7 @@ index a2fe489bd..f574a28b6 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index b8f1c64f4..456ee64ed 100644
index b8f1c64f4..de95625c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -18,6 +18,10 @@ import org.bukkit.craftbukkit.util.CraftChatMessage;
@ -39,12 +39,12 @@ index b8f1c64f4..456ee64ed 100644
if (tag.hasKey(BOOK_TITLE.NBT)) {
- this.title = tag.getString(BOOK_TITLE.NBT);
+ this.title = limit( tag.getString(BOOK_TITLE.NBT), 1024 ); // Spigot
+ this.title = limit( tag.getString(BOOK_TITLE.NBT), 8192 ); // Spigot
}
if (tag.hasKey(BOOK_AUTHOR.NBT)) {
- this.author = tag.getString(BOOK_AUTHOR.NBT);
+ this.author = limit( tag.getString(BOOK_AUTHOR.NBT), 1024 ); // Spigot
+ this.author = limit( tag.getString(BOOK_AUTHOR.NBT), 8192 ); // Spigot
}
boolean resolved = false;
@ -53,12 +53,12 @@ index b8f1c64f4..456ee64ed 100644
}
}
- addPage(page);
+ addPage( limit( page, 2048 ) ); // Spigot
+ addPage( limit( page, 16384 ) ); // Spigot
}
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 340ad1809..9feec0d85 100644
index 340ad1809..c9516a77e 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -78,6 +78,10 @@ import org.bukkit.inventory.meta.Repairable;
@ -77,7 +77,7 @@ index 340ad1809..9feec0d85 100644
if (display.hasKey(NAME.NBT)) {
try {
- displayName = IChatBaseComponent.ChatSerializer.a(display.getString(NAME.NBT));
+ displayName = IChatBaseComponent.ChatSerializer.a( limit( display.getString(NAME.NBT), 1024 ) ); // Spigot
+ displayName = IChatBaseComponent.ChatSerializer.a( limit( display.getString(NAME.NBT), 8192 ) ); // Spigot
} catch (JsonParseException ex) {
// Ignore (stripped like Vanilla)
}
@ -86,7 +86,7 @@ index 340ad1809..9feec0d85 100644
if (display.hasKey(LOCNAME.NBT)) {
try {
- locName = IChatBaseComponent.ChatSerializer.a(display.getString(LOCNAME.NBT));
+ locName = IChatBaseComponent.ChatSerializer.a( limit( display.getString(LOCNAME.NBT), 1024 ) ); // Spigot
+ locName = IChatBaseComponent.ChatSerializer.a( limit( display.getString(LOCNAME.NBT), 8192 ) ); // Spigot
} catch (JsonParseException ex) {
// Ignore (stripped like Vanilla)
}