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.