Update upstream and rebuild patches

Bukkit

@@ -1 +1 @@
-Subproject commit 485fc0c47004dcad63c4b425a25dfd9850bc3cb6
+Subproject commit 0b10b8e543444426153f48d4ec348ac15f4cf1f3

CraftBukkit

@@ -1 +1 @@
-Subproject commit 4cd46b242beecb828dbe193c9cb913b620e852d1
+Subproject commit b3f6de0da51ba476bb6792f6fdf44cec472d3cce

Spigot-Server-Patches/Revert-Spigot-changes-to-blocking-code-fix-issue-whe.patch

@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: DemonWav <demonwav@gmail.com>
-Date: Sat, 19 Mar 2016 12:14:50 -0500
-Subject: [PATCH] Revert Spigot changes to blocking code, fix issue where
- entities cannot die
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -0,0 +0,0 @@
- package net.minecraft.server;
- 
--import com.google.common.base.Objects;
--import com.google.common.collect.Maps;
--import java.util.Collection;
--import java.util.Iterator;
--import java.util.List;
--import java.util.Map;
--import java.util.Random;
--import java.util.UUID;
--
--// CraftBukkit start
--import java.util.ArrayList;
- import com.google.common.base.Function;
-+import com.google.common.base.Objects;
- import com.google.common.collect.Lists;
-+import com.google.common.collect.Maps;
- import org.bukkit.craftbukkit.attribute.CraftAttributeMap;
- import org.bukkit.craftbukkit.event.CraftEventFactory;
- import org.bukkit.craftbukkit.inventory.CraftItemStack;
--import org.bukkit.entity.LivingEntity;
- import org.bukkit.entity.Player;
- import org.bukkit.event.entity.EntityDamageEvent;
- import org.bukkit.event.entity.EntityDamageEvent.DamageModifier;
- import org.bukkit.event.entity.EntityRegainHealthEvent;
- import org.bukkit.event.player.PlayerItemConsumeEvent;
--// CraftBukkit end
- 
--import co.aikar.timings.SpigotTimings; // Paper
-+import java.util.ArrayList;
-+import java.util.Collection;
-+import java.util.Iterator;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.Random;
-+import java.util.UUID;
-+
-+// CraftBukkit start
-+// CraftBukkit end
- 
- public abstract class EntityLiving extends Entity {
- 
-@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
-             Function<Double, Double> blocking = new Function<Double, Double>() {
-                 @Override
-                 public Double apply(Double f) {
--                    return (damagesource.a()) ? -0.0 : f * 0.33F; // PAIL: rename
-+                    // Paper start - revert Spigot change
-+                    if (human) {
-+                        if (!damagesource.ignoresArmor() && ((EntityHuman) EntityLiving.this).isBlocking() && f > 0.0F) {
-+                            return -(f - ((1.0F + f) * 0.5F));
-+                        }
-+                    }
-+                    return -0.0;
-+                    // Paper end
-                 }
-             };
-             float blockingModifier = blocking.apply((double) f).floatValue();
---