Updated Upstream (Bukkit/CraftBukkit) (#3980)

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:
09f10fd9 SPIGOT-5950: Add PrepareSmithingEvent event

CraftBukkit Changes:
7c03d257 SPIGOT-6011: End Gateways do not work on Non-Main End Worlds
d492e363 SPIGOT-6015: Small Armor Stand doesn't drop items
5db13eea SPIGOT-5950: Add PrepareSmithingEvent event

Spigot-Server-Patches/Improve-death-events.patch

@@ -228,24 +228,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          int i;
  
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
-         boolean flag = this.lastDamageByPlayerTime > 0;
- 
-         this.dropInventory(); // CraftBukkit - from below
-+        org.bukkit.event.entity.EntityDeathEvent deathEvent; // Paper
-         if (this.cV() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
-             this.a(damagesource, flag);
              this.dropDeathLoot(damagesource, i, flag);
-             // CraftBukkit start - Call death event
--            CraftEventFactory.callEntityDeathEvent(this, this.drops);
--            this.drops = new ArrayList<org.bukkit.inventory.ItemStack>();
-+            deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
-         } else {
--            CraftEventFactory.callEntityDeathEvent(this);
-+            deathEvent = CraftEventFactory.callEntityDeathEvent(this); // Paper
-             // CraftBukkit end
          }
+         // CraftBukkit start - Call death event
+-        CraftEventFactory.callEntityDeathEvent(this, this.drops);
++        org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
 +        this.postDeathDropItems(deathEvent); // Paper
-+        this.drops = new ArrayList<>(); // Paper
+         this.drops = new ArrayList<>();
+         // CraftBukkit end
  
          // this.dropInventory();// CraftBukkit - moved up
          this.dropExperience();