From 6a453b296c1f43c3cef7a6e7bc4621f65e7e54a1 Mon Sep 17 00:00:00 2001
From: Sam <huzzahpinkyoshi@gmail.com>
Date: Sat, 3 Mar 2018 15:30:35 +0000
Subject: [PATCH] Prevent non-player entities riding in the Minecart Mount

---
 .../gadget/gadgets/mount/types/MountCart.java | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountCart.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountCart.java
index 2bc5477e3..7e9b02263 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountCart.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/mount/types/MountCart.java
@@ -6,6 +6,7 @@ import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.vehicle.VehicleDamageEvent;
+import org.bukkit.event.vehicle.VehicleEnterEvent;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.LineFormat;
@@ -70,7 +71,25 @@ public class MountCart extends Mount<SingleEntityMountData<Minecart>>
 			}
 		}
 	}
-	
+
+	@EventHandler
+	public void vehicleEnter(VehicleEnterEvent event)
+	{
+		if (event.getEntered() instanceof Player)
+		{
+			return;
+		}
+
+		for (SingleEntityMountData<Minecart> data : getActiveMounts().values())
+		{
+			if (data.getEntity().equals(event.getVehicle()))
+			{
+				event.setCancelled(true);
+				return;
+			}
+		}
+	}
+
 	@EventHandler
 	public void cancelBreak(VehicleDamageEvent event)
 	{
@@ -79,6 +98,7 @@ public class MountCart extends Mount<SingleEntityMountData<Minecart>>
 			if (data.getEntity().equals(event.getVehicle()))
 			{
 				event.setCancelled(true);
+				return;
 			}
 		}
 	}