From 97caed9313eaaf62f094ee472f736d7468f8b56f Mon Sep 17 00:00:00 2001
From: Super_ <awesomegamer156@gmail.com>
Date: Fri, 13 Dec 2019 19:58:49 -0500
Subject: [PATCH] fixed it yeet

---
 .../totalfreedommod/blocking/EventBlocker.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
index 8f035d97..c277d4b4 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java
@@ -10,6 +10,7 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import me.totalfreedom.totalfreedommod.util.Groups;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.attribute.Attribute;
@@ -18,6 +19,7 @@ import org.bukkit.block.ShulkerBox;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Minecart;
+import org.bukkit.entity.Player;
 import org.bukkit.entity.Tameable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -238,6 +240,16 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDeath(PlayerDeathEvent event)
     {
+        for (Player p : Bukkit.getOnlinePlayers())
+        {
+            for (Entity passengerEntity : p.getPassengers())
+            {
+                if (passengerEntity == event.getEntity())
+                {
+                    p.removePassenger(passengerEntity);
+                }
+            }
+        }
         event.setDeathMessage(event.getDeathMessage());
     }
 }