From 98f1aae7fafd7acb8ce7a99d0b54872e75d48f64 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 11 Oct 2020 19:32:08 -0400 Subject: [PATCH] Retain block place order when capturing blockstates Fixes twisted vines not connecting properly when grown via bonemeal by a player. In general, look at making this logic more robust (i.e properly handling cases where a captured entry is overriden) - but for now this will do. --- ...ace-order-when-capturing-blockstates.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Spigot-Server-Patches/0590-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/Spigot-Server-Patches/0590-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0590-Retain-block-place-order-when-capturing-blockstates.patch new file mode 100644 index 000000000..087a7b219 --- /dev/null +++ b/Spigot-Server-Patches/0590-Retain-block-place-order-when-capturing-blockstates.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spottedleaf +Date: Fri, 7 Aug 2020 04:27:56 -0700 +Subject: [PATCH] Retain block place order when capturing blockstates + +Fixes twisted vines not connecting properly when grown via +bonemeal by a player. + +In general, look at making this logic more robust (i.e properly handling +cases where a captured entry is overriden) - but for now this will do. + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index eec338649edbdaebbe694a23ccb7a8b5cd5f9a15..d91124bc85ed1a5b39e0ac3966f0af8ed9ee62b9 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -75,7 +75,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { + public boolean captureBlockStates = false; + public boolean captureTreeGeneration = false; + public Map capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper +- public Map capturedTileEntities = new HashMap<>(); ++ public Map capturedTileEntities = new java.util.LinkedHashMap<>(); // Paper + public List captureDrops; + public long ticksPerAnimalSpawns; + public long ticksPerMonsterSpawns;