From 184140e341f0d7501dd97f8817ebea852eca6a95 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Fri, 30 Jul 2021 12:38:15 +0200
Subject: [PATCH] Remove passengers in Entity#remove

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

diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java
index 8512a9221..871306fb6 100644
--- a/src/main/java/net/minestom/server/entity/Entity.java
+++ b/src/main/java/net/minestom/server/entity/Entity.java
@@ -1506,6 +1506,10 @@ public class Entity implements Viewable, Tickable, EventHandler<EntityEvent>, Da
         if (isRemoved())
             return;
 
+        // Remove passengers if any (also done with LivingEntity#kill)
+        if (hasPassenger()) {
+            getPassengers().forEach(this::removePassenger);
+        }
         MinecraftServer.getUpdateManager().getThreadProvider().removeEntity(this);
         this.removed = true;
         this.shouldRemove = true;