From ddb688632f12d31fd2699f1af36ad123f4a0a153 Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Tue, 18 Sep 2018 23:53:23 +0100
Subject: [PATCH] PreSpawnerSpawnEvent

This adds a separate event before an entity is spawned by a spawner
which contains the location of the spawner too similarly to how the
SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
spawners.

diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index 6f5d8b0315..079099e308 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -110,11 +110,11 @@ public abstract class MobSpawnerAbstract {
 
                     org.bukkit.entity.EntityType type = org.bukkit.entity.EntityType.fromName(key);
                     if (type != null) {
-                        com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event;
-                        event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent(
+                        com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent event;
+                        event = new com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent(
                             MCUtil.toLocation(world, d3, d4, d5),
                             type,
-                            org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER
+                            MCUtil.toLocation(world, blockposition)
                         );
                         if (!event.callEvent()) {
                             flag = true;
-- 
2.22.0