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 0000000000..087a7b219c
--- /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 <spottedleaf@spottedleaf.dev>
+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<BlockPosition, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper
+-    public Map<BlockPosition, TileEntity> capturedTileEntities = new HashMap<>();
++    public Map<BlockPosition, TileEntity> capturedTileEntities = new java.util.LinkedHashMap<>(); // Paper
+     public List<EntityItem> captureDrops;
+     public long ticksPerAnimalSpawns;
+     public long ticksPerMonsterSpawns;