Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Bukkit Changes:
3e2858f6 SPIGOT-4352: MoistureChangeEvent
5466e281 Add BlockDispenseArmorEvent

CraftBukkit Changes:
3123a069 SPIGOT-4352: MoistureChangeEvent
226db0ea Add BlockDispenseArmorEvent
cd367fa4 Fix bad thread safety in ChunkRegionLoader
3f5ca5f2 SPIGOT-4355: Improve cancelling VehicleEnterEvent

Spigot Changes:
145a37ae Rebuild patches
3f2423cc Rebuild patches

Spigot-Server-Patches/Chunk-save-queue-improvements.patch

@@ -41,7 +41,7 @@ index 0d68ffd75a..fd00c320ce 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f969c036f3..2b0a088a6a 100644
+index 2e9bd0949a..3166d4b1ad 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +0,0 @@ import java.util.function.Consumer;
@@ -70,7 +70,7 @@ index f969c036f3..2b0a088a6a 100644
 +    // Paper end
 +
      private static final Logger a = LogManager.getLogger();
-     private final Map<ChunkCoordIntPair, Supplier<NBTTagCompound>> b = Maps.newHashMap();
+     private final Map<ChunkCoordIntPair, Supplier<NBTTagCompound>> b = java.util.Collections.synchronizedMap(Maps.newHashMap()); // CraftBukkit // Spigot
      private final File c;
 @@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                      }
@@ -99,6 +99,7 @@ index f969c036f3..2b0a088a6a 100644
      }
  
      private boolean processSaveQueueEntry(boolean logCompletion) {
+-        synchronized (this.b) { // CraftBukkit
 -        Iterator iterator = this.b.entrySet().iterator();
 -        if (!iterator.hasNext()) {
 +        // Paper start - Chunk queue improvements