From 8dad068601c1182f34bb72dcf9ae9ed243ede728 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 28 Aug 2020 12:06:39 +0100 Subject: [PATCH] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 3f572834 #740: Fix EntityDamageEvent not being called for non EntityDamageSource for End Crystals 3c7143e7 SPIGOT-5953, SPIGOT-5914: Use LinkedHashMap to keep captured block states in order --- ...use-CB-BlockState-implementations-for-captured-block.patch | 4 ++-- work/CraftBukkit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch index 8b4fb45e72..1bda3b8737 100644 --- a/Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch @@ -25,8 +25,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public boolean captureBlockStates = false; public boolean captureTreeGeneration = false; -- public Map capturedBlockStates = new HashMap<>(); -+ public Map capturedBlockStates = new HashMap<>(); // Paper +- public Map capturedBlockStates = new java.util.LinkedHashMap<>(); ++ public Map capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper public Map capturedTileEntities = new HashMap<>(); public List captureDrops; public long ticksPerAnimalSpawns; diff --git a/work/CraftBukkit b/work/CraftBukkit index 7d31adb5f7..3f572834a6 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 7d31adb5f7e871581044fc8547eb723f4fad6a5d +Subproject commit 3f572834a632e841cb3fd5db400130097a990c7a