From dca071141c46c0a33300fd49f7b1f1f4cf8508ce Mon Sep 17 00:00:00 2001
From: business-goose <arclicious@vivaldi.net>
Date: Wed, 23 Mar 2022 23:00:25 +0000
Subject: [PATCH] Attempt to patch Minecart crash

---
 .../TotalFreedomMod/listener/EntityListener.java         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/listener/EntityListener.java b/src/main/java/me/StevenLawson/TotalFreedomMod/listener/EntityListener.java
index 8de59eb..5cf23ed 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/listener/EntityListener.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/listener/EntityListener.java
@@ -142,14 +142,21 @@ public class EntityListener implements Listener {
         }
     }
 
+    //FIXME Make patch better
+
     @EventHandler(priority = EventPriority.HIGH)
-    public void onVehicleCollision(VehicleEntityCollisionEvent event) {
+    public void onVehicleCollisionEntity(VehicleEntityCollisionEvent event) {
         event.setCollisionCancelled(true);
         event.setPickupCancelled(true);
         event.setCancelled(true);
         event.getVehicle().remove();
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onVehicleCollisionBlock(VehicleBlockCollisionEvent event) {
+        event.getVehicle().remove();
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDeath(EntityDeathEvent event)
     {