Fire EntityRemoveFromWorldEvent (fixes part of #922) (#941)

GlowstoneMC · Jun 5, 2018 · 8058aa7 · 8058aa7
1 parent 8316707
commit 8058aa7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/net/glowstone/entity/EntityManager.java b/src/main/java/net/glowstone/entity/EntityManager.java
@@ -2,6 +2,7 @@
 
 import static com.google.common.collect.Multimaps.newSetMultimap;
 
+import com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import java.util.Collection;
@@ -12,6 +13,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
+
+import net.glowstone.EventFactory;
 import net.glowstone.chunk.GlowChunk;
 import net.glowstone.entity.physics.BoundingBox;
 import org.bukkit.Chunk;
@@ -93,6 +96,7 @@ void register(GlowEntity entity) {
      * @param entity The entity.
      */
     void unregister(GlowEntity entity) {
+        EventFactory.getInstance().callEvent(new EntityRemoveFromWorldEvent(entity));
         entities.remove(entity.entityId);
         groupedEntities.remove(entity.getClass(), entity);
         ((GlowChunk) entity.location.getChunk()).getRawEntities().remove(entity);

diff --git a/src/main/java/net/glowstone/entity/GlowEntity.java b/src/main/java/net/glowstone/entity/GlowEntity.java
@@ -1099,7 +1099,7 @@ public void remove() {
         world.getEntityManager().unregister(this);
         server.getEntityIdManager().deallocate(this);
         this.setPassenger(null);
-
+        leaveVehicle();
         ImmutableList.copyOf(this.leashedEntities)
                 .forEach(e -> unleash(e, UnleashReason.HOLDER_GONE));
 

diff --git a/src/main/java/net/glowstone/entity/GlowLivingEntity.java b/src/main/java/net/glowstone/entity/GlowLivingEntity.java
@@ -838,7 +838,6 @@ public void setHealth(double health) {
             world.playSound(location, deathSound, getSoundVolume(), getSoundPitch());
         }
         playEffect(EntityEffect.DEATH);
-        leaveVehicle();
         if (this instanceof GlowPlayer) {
             GlowPlayer player = (GlowPlayer) this;
             ItemStack mainHand = player.getInventory().getItemInMainHand();