1 files changed, 70 insertions, 0 deletions
diff --git a/patches/server/0399-Cache-block-data-strings.patch b/patches/server/0399-Cache-block-data-strings.patch
new file mode 100644
index 0000000000..89a3e25bc6
--- /dev/null
+++ b/patches/server/0399-Cache-block-data-strings.patch
@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: miclebrick <[email protected]>
+Date: Thu, 6 Dec 2018 19:52:50 -0500
+Subject: [PATCH] Cache block data strings
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 83848e30eeff52ccad591deb0d9e3a8ba1a122ed..6292256864aa0a265a73c0ef2af642d4ab387ccc 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -2184,6 +2184,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
+             this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
+             this.fuelValues = FuelValues.vanillaBurnTimes(this.registries.compositeAccess(), this.worldData.enabledFeatures());
++            org.bukkit.craftbukkit.block.data.CraftBlockData.reloadCache(); // Paper - cache block data strings; they can be defined by datapacks so refresh it here
+         }, this);
+ 
+         if (this.isSameThread()) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
+index 82816ad68da8b034b46904f9eb82e7ecd9fc8dbf..22b8603a0eb7e981ca3483b37d3b7af28f300dfd 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
+@@ -156,7 +156,7 @@ public class CraftBlockData implements BlockData {
+         return exactMatch;
+     }
+ 
+-    private static final Map<Class<? extends Enum<?>>, Enum<?>[]> ENUM_VALUES = new HashMap<>();
++    private static final Map<Class<? extends Enum<?>>, Enum<?>[]> ENUM_VALUES = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - cache block data strings; make thread safe
+ 
+     /**
+      * Convert an NMS Enum (usually a BlockStateEnum) to its appropriate Bukkit
+@@ -548,7 +548,38 @@ public class CraftBlockData implements BlockData {
+         Preconditions.checkState(CraftBlockData.MAP.put(nms, bukkit) == null, "Duplicate mapping %s->%s", nms, bukkit);
+     }
+ 
++    // Paper start - cache block data strings
++    private static Map<String, CraftBlockData> stringDataCache = new java.util.concurrent.ConcurrentHashMap<>();
++
++    static {
++        // cache all of the default states at startup, will not cache ones with the custom states inside of the
++        // brackets in a different order, though
++        reloadCache();
++    }
++
++    public static void reloadCache() {
++        stringDataCache.clear();
++        Block.BLOCK_STATE_REGISTRY.forEach(blockData -> stringDataCache.put(blockData.toString(), blockData.createCraftBlockData()));
++    }
++    // Paper end - cache block data strings
++
+     public static CraftBlockData newData(BlockType blockType, String data) {
++
++        // Paper start - cache block data strings
++        if (blockType != null) {
++            Block block = CraftBlockType.bukkitToMinecraftNew(blockType);
++            if (block != null) {
++                net.minecraft.resources.ResourceLocation key = BuiltInRegistries.BLOCK.getKey(block);
++                data = data == null ? key.toString() : key + data;
++            }
++        }
++
++        CraftBlockData cached = stringDataCache.computeIfAbsent(data, s -> createNewData(null, s));
++        return (CraftBlockData) cached.clone();
++    }
++
++    private static CraftBlockData createNewData(BlockType blockType, String data) {
++        // Paper end - cache block data strings
+         net.minecraft.world.level.block.state.BlockState blockData;
+         Block block = blockType == null ? null : ((CraftBlockType<?>) blockType).getHandle();
+         Map<Property<?>, Comparable<?>> parsed = null;