Merge branch 'master' into pre/1.13

* master:
  Apply spawner delay for cancelled pre spawn events (#1276)

Spigot-Server-Patches/PreCreatureSpawnEvent.patch

@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index c76dbe74ac..b88160a2ed 100644
+index c76dbe74ac..d10196fcbd 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -0,0 +0,0 @@
@@ -44,6 +44,7 @@ index c76dbe74ac..b88160a2ed 100644
 +                                org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER
 +                        );
 +                        if (!event.callEvent()) {
++                            flag = true;
 +                            if (event.shouldAbortSpawn()) {
 +                                break;
 +                            }