--- a/net/minecraft/world/level/entity/EntityAccess.java
+++ b/net/minecraft/world/level/entity/EntityAccess.java
@@ -18,7 +_,13 @@
 
     Stream<? extends EntityAccess> getPassengersAndSelf();
 
-    void setRemoved(Entity.RemovalReason removalReason);
+    // CraftBukkit start - add Bukkit remove cause
+    default void setRemoved(Entity.RemovalReason removalReason) {
+        this.setRemoved(removalReason, null);
+    }
+
+    void setRemoved(Entity.RemovalReason removalReason, @javax.annotation.Nullable org.bukkit.event.entity.EntityRemoveEvent.Cause eventCause);
+    // CraftBukkit end - add Bukkit remove cause
 
     boolean shouldBeSaved();
 
