From c247857fd419bffa77479b70de44b29b45dc4ba8 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Thu, 6 Dec 2018 19:53:27 -0500 Subject: [PATCH] Cache block data strings --- .../0575-Cache-block-data-strings.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 Spigot-Server-Patches/0575-Cache-block-data-strings.patch diff --git a/Spigot-Server-Patches/0575-Cache-block-data-strings.patch b/Spigot-Server-Patches/0575-Cache-block-data-strings.patch new file mode 100644 index 000000000..ae60f68f8 --- /dev/null +++ b/Spigot-Server-Patches/0575-Cache-block-data-strings.patch @@ -0,0 +1,62 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: miclebrick +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 bbe793ca3667264eafa094bfea1c061011c73b92..65e8dc34029598ec84af66348f437f9d4b084bb4 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -1825,6 +1825,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant%s", nms, bukkit); + } + ++ // Paper start - cache block data strings ++ private static Map stringDataCache = new HashMap<>(); ++ ++ 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.REGISTRY_ID.forEach(blockData -> stringDataCache.put(blockData.toString(), blockData.createCraftBlockData())); ++ } ++ // Paper end ++ + public static CraftBlockData newData(Material material, String data) { + Preconditions.checkArgument(material == null || material.isBlock(), "Cannot get data for not block %s", material); + ++ // Paper start - cache block data strings ++ if (material != null) { ++ Block block = CraftMagicNumbers.getBlock(material); ++ if (block != null) { ++ net.minecraft.server.MinecraftKey key = IRegistry.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(Material material, String data) { ++ // Paper end - cache block data strings + IBlockData blockData; + Block block = CraftMagicNumbers.getBlock(material); + Map, Comparable> parsed = null;