Readd 0414 use distance map to optimise entity tracker (#9868)

1 files changed, 0 insertions, 55 deletions

diff --git a/patches/server/0620-Make-item-validations-configurable.patch b/patches/server/0620-Make-item-validations-configurable.patch
deleted file mode 100644
index c080248e33..0000000000
--- a/patches/server/0620-Make-item-validations-configurable.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Fri, 4 Jun 2021 12:12:35 -0700
-Subject: [PATCH] Make item validations configurable
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 5e01357208fe52c1d270c68cb19029ea0f4057bb..6d85237b21650edf1d2dc71abaf0edbe7a8aef6b 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-@@ -88,11 +88,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
-         super(tag);
- 
-         if (tag.contains(CraftMetaBook.BOOK_TITLE.NBT)) {
--            this.title = limit( tag.getString(CraftMetaBook.BOOK_TITLE.NBT), 8192 ); // Spigot
-+            this.title = limit( tag.getString(CraftMetaBook.BOOK_TITLE.NBT), io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.book.title); // Spigot // Paper - make configurable
-         }
- 
-         if (tag.contains(CraftMetaBook.BOOK_AUTHOR.NBT)) {
--            this.author = limit( tag.getString(CraftMetaBook.BOOK_AUTHOR.NBT), 8192 ); // Spigot
-+            this.author = limit( tag.getString(CraftMetaBook.BOOK_AUTHOR.NBT), io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.book.author ); // Spigot // Paper - make configurable
-         }
- 
-         if (tag.contains(CraftMetaBook.RESOLVED.NBT)) {
-@@ -120,7 +120,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
-                 } else {
-                     page = this.validatePage(page);
-                 }
--                this.pages.add( limit( page, 16384 ) ); // Spigot
-+                this.pages.add( limit( page, io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.book.page ) ); // Spigot // Paper - make configurable
-             }
-         }
-     }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 0766b991079bfda1558cc17b75ff3dd06c1ad725..f6d2785b05b4c0a4393be706a90d7cc4388399bf 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -361,7 +361,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-             CompoundTag display = tag.getCompound(CraftMetaItem.DISPLAY.NBT);
- 
-             if (display.contains(CraftMetaItem.NAME.NBT)) {
--                this.displayName = limit( display.getString(CraftMetaItem.NAME.NBT), 8192 ); // Spigot
-+                this.displayName = limit( display.getString(CraftMetaItem.NAME.NBT), io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.displayName ); // Spigot // Paper - make configurable
-             }
- 
-             if (display.contains(CraftMetaItem.LOCNAME.NBT)) {
-@@ -372,7 +372,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                 ListTag list = display.getList(CraftMetaItem.LORE.NBT, CraftMagicNumbers.NBT.TAG_STRING);
-                 this.lore = new ArrayList<String>(list.size());
-                 for (int index = 0; index < list.size(); index++) {
--                    String line = limit( list.getString(index), 8192 ); // Spigot
-+                    String line = limit( list.getString(index), io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.loreLine ); // Spigot // Paper - make configurable
-                     this.lore.add(line);
-                 }
-             }