From 0000000000000000000000000000000000000000 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/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
index db4beb22cf54bb3b53561ec0fe06209c478977ff..388a66e37c9f1d9c62e0c8977a2d5b9068c58fe7 100644
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
@@ -136,11 +136,11 @@ public abstract class BaseSpawner {
 
                         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(
                                 io.papermc.paper.util.MCUtil.toLocation(world, d0, d1, d2),
                                 type,
-                                org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER
+                                io.papermc.paper.util.MCUtil.toLocation(world, pos)
                             );
                             if (!event.callEvent()) {
                                 flag = true;