From 997285e344a889e0fa1f3cc21fe1852c7d6ff583 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 24 Jun 2016 00:16:46 -0400
Subject: [PATCH] Update Entity AddTo|RemoveFrom World events to be
 EntityEvents

---
 ...Entity-AddTo-RemoveFrom-World-Events.patch | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/Spigot-API-Patches/Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/Entity-AddTo-RemoveFrom-World-Events.patch
index 13449e66a6..22eee48f39 100644
--- a/Spigot-API-Patches/Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-API-Patches/Entity-AddTo-RemoveFrom-World-Events.patch
@@ -15,6 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.entity.Entity;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
 +
 +/**
 + * Fired any time an entity is being added to the world for any reason.
@@ -22,19 +23,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + * Not to be confused with {@link org.bukkit.event.entity.CreatureSpawnEvent}
 + * This will fire anytime a chunk is reloaded too.
 + */
-+public class EntityAddToWorldEvent extends Event {
++public class EntityAddToWorldEvent extends EntityEvent {
 +
-+    private final Entity entity;
 +    public EntityAddToWorldEvent(Entity entity) {
-+        this.entity = entity;
-+    }
-+
-+    /**
-+     * Gets the entity being added to the world
-+     * @return
-+     */
-+    public Entity getEntity() {
-+        return entity;
++        super(entity);
 +    }
 +
 +    private static final HandlerList handlers = new HandlerList();
@@ -58,23 +50,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.entity.Entity;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityEvent;
 +
 +/**
 + * Fired any time an entity is being removed from a world for any reason
 + */
-+public class EntityRemoveFromWorldEvent extends Event {
-+    private final Entity entity;
++public class EntityRemoveFromWorldEvent extends EntityEvent {
 +
 +    public EntityRemoveFromWorldEvent(Entity entity) {
-+        this.entity = entity;
-+    }
-+
-+    /**
-+     * Gets the entity being removed from the world
-+     * @return
-+     */
-+    public Entity getEntity() {
-+        return entity;
++        super(entity);
 +    }
 +
 +    private static final HandlerList handlers = new HandlerList();