From 9df6b19f1d6fe342e07ec3a95ad1484132fd3813 Mon Sep 17 00:00:00 2001
From: Felix Cravic <themode@outlook.fr>
Date: Mon, 25 May 2020 21:14:28 +0200
Subject: [PATCH] Remove passengers at death

---
 src/main/java/net/minestom/server/entity/LivingEntity.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/net/minestom/server/entity/LivingEntity.java b/src/main/java/net/minestom/server/entity/LivingEntity.java
index fe7de4a54..fa6836f9d 100644
--- a/src/main/java/net/minestom/server/entity/LivingEntity.java
+++ b/src/main/java/net/minestom/server/entity/LivingEntity.java
@@ -171,6 +171,11 @@ public abstract class LivingEntity extends Entity implements EquipmentHandler {
         // Reset velocity
         velocity.zero();
 
+        // Remove passengers if any
+        if (hasPassenger()) {
+            getPassengers().forEach(entity -> removePassenger(entity));
+        }
+
         EntityDeathEvent entityDeathEvent = new EntityDeathEvent(this);
         callEvent(EntityDeathEvent.class, entityDeathEvent);
     }