3in1: Update Upstream, Remove useless patches, Fix cramming/colliding bug

patches/api/0006-Add-village-raid-spawn-reason.patch

@@ -0,0 +1,29 @@
+From 2fae1badaf27a72abd830879c8624fddbc749eb3 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <blake.galbreath@gmail.com>
+Date: Wed, 29 May 2019 23:38:50 -0500
+Subject: [PATCH] Add village raid spawn reason
+
+---
+ .../java/org/bukkit/event/entity/CreatureSpawnEvent.java    | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+index 17aa6722b..323322510 100644
+--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
++++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
+@@ -95,6 +95,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent {
+          * When a zombie is spawned to invade a village
+          */
+         VILLAGE_INVASION,
++        // Purpur start
++        /**
++         * When an entity is spawned to raid a village
++         */
++        VILLAGE_RAID,
++        // Purpur end
+         /**
+          * When an animal breeds to create a child
+          */
+-- 
+2.20.1
+