From 42ea9111bd230ec9332c6f7d575323e0fe3152fc Mon Sep 17 00:00:00 2001
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
Date: Wed, 20 Jul 2022 16:58:18 +0200
Subject: [PATCH] Fix vehicles not being killed by lava (#6044)

* Fix minecarts not being killed by lava

* Diff
---
 .../bukkit/towny/listeners/TownyVehicleListener.java            | 2 +-
 src/com/palmergames/bukkit/util/ItemLists.java                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/palmergames/bukkit/towny/listeners/TownyVehicleListener.java b/src/com/palmergames/bukkit/towny/listeners/TownyVehicleListener.java
index 5c4e0b4140..fcd3853eb3 100644
--- a/src/com/palmergames/bukkit/towny/listeners/TownyVehicleListener.java
+++ b/src/com/palmergames/bukkit/towny/listeners/TownyVehicleListener.java
@@ -47,7 +47,7 @@ public void onVehicleDamage(VehicleDamageEvent event) {
 			return;
 		}
 
-		if (!TownyAPI.getInstance().isTownyWorld(event.getVehicle().getWorld()))
+		if (!TownyAPI.getInstance().isTownyWorld(event.getVehicle().getWorld()) || (event.getAttacker() == null && event.getVehicle().getFireTicks() > 0))
 			return;
 
 		if (event.getAttacker() == null) {  // Probably a respawn anchor or a TNT minecart or TNT lit by redstone.
diff --git a/src/com/palmergames/bukkit/util/ItemLists.java b/src/com/palmergames/bukkit/util/ItemLists.java
index 201cdb0b7d..784ebc5e49 100644
--- a/src/com/palmergames/bukkit/util/ItemLists.java
+++ b/src/com/palmergames/bukkit/util/ItemLists.java
@@ -226,7 +226,7 @@ public boolean contains(@NotNull ItemStack itemStack) {
 	/*
 	 * List of blocks which will be allowed to kill Minecarts.
 	 */
-	public static final ItemLists MINECART_KILLERS = ItemLists.of("CACTUS", "LAVA_CAULDRON");
+	public static final ItemLists MINECART_KILLERS = ItemLists.of("CACTUS");
 	
 	/*
 	 * List of unstripped wood logs.