core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove locname (#7909)

This commit is contained in:
Owen 2022-06-09 15:56:21 -04:00 committed by GitHub
parent 2e68ecc289
commit d9fcf39f65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
patches/server/0004-Paper-config-files.patch
View File

@ -404,10 +404,10 @@ index 0000000000000000000000000000000000000000..844275e8671c62633e370ae3d4e0738e
+} +}
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..2d04305279108f2102ebb026998d391f017ba721 index 0000000000000000000000000000000000000000..30633591ecd078997e7bb0dc937f8c5ddedaa3ab
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -0,0 +1,264 @@ @@ -0,0 +1,263 @@
+package io.papermc.paper.configuration; +package io.papermc.paper.configuration;
+ +
+import co.aikar.timings.MinecraftTimings; +import co.aikar.timings.MinecraftTimings;
@ -592,7 +592,6 @@ index 0000000000000000000000000000000000000000..2d04305279108f2102ebb026998d391f
+ +
+ public class ItemValidation extends ConfigurationPart { + public class ItemValidation extends ConfigurationPart {
+ public int displayName = 8192; + public int displayName = 8192;
+ public int locName = 8192; // TODO not used anymore, can we remove?
+ public int loreLine = 8192; + public int loreLine = 8192;
+ public Book book; + public Book book;
+ +

10
patches/server/0664-Make-item-validations-configurable.patch
View File

@ -32,10 +32,10 @@ index fefa4d83c5699be0b55794cd28d13d27b66ef108..d662cb0567884ec91c900f5c90ecb369
} }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index c475ddea1c995df1dfcaf4f491f341761a5f8802..c098003d5801b132d71adbaa9f85c41854c684e4 100644 index c475ddea1c995df1dfcaf4f491f341761a5f8802..a8294bf057e03c5d866f6da31e6cdfa9edd3f146 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -357,18 +357,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @@ -357,7 +357,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
CompoundTag display = tag.getCompound(DISPLAY.NBT); CompoundTag display = tag.getCompound(DISPLAY.NBT);
if (display.contains(NAME.NBT)) { if (display.contains(NAME.NBT)) {
@ -44,11 +44,7 @@ index c475ddea1c995df1dfcaf4f491f341761a5f8802..c098003d5801b132d71adbaa9f85c418
} }
if (display.contains(LOCNAME.NBT)) { if (display.contains(LOCNAME.NBT)) {
- this.locName = limit( display.getString(LOCNAME.NBT), 8192 ); // Spigot @@ -368,7 +368,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+ this.locName = limit( display.getString(LOCNAME.NBT), io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.locName ); // Spigot // Paper - make configurable
}
if (display.contains(LORE.NBT)) {
ListTag list = display.getList(LORE.NBT, CraftMagicNumbers.NBT.TAG_STRING); ListTag list = display.getList(LORE.NBT, CraftMagicNumbers.NBT.TAG_STRING);
this.lore = new ArrayList<String>(list.size()); this.lore = new ArrayList<String>(list.size());
for (int index = 0; index < list.size(); index++) { for (int index = 0; index < list.size(); index++) {