From 89430c13ecb6645b28ea51fd926212c1ef0d37e8 Mon Sep 17 00:00:00 2001 From: wizjany Date: Fri, 15 Mar 2013 15:32:57 -0400 Subject: [PATCH] Handle TNT Minecarts with tnt flag/settings. --- pom.xml | 2 +- .../sk89q/worldguard/bukkit/WorldGuardEntityListener.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fe155a7f..14982c67 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ org.bukkit bukkit - 1.4.7-R1.0 + 1.5-R0.1-SNAPSHOT compile diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java index 5620b56b..3cd1f44a 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java @@ -35,6 +35,8 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Fireball; import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Minecart; +import org.bukkit.entity.MinecartTNT; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.entity.TNTPrimed; @@ -272,7 +274,7 @@ private void onEntityDamageByEntity(EntityDamageByEntityEvent event) { } } - if (attacker instanceof TNTPrimed) { + if (attacker instanceof TNTPrimed || attacker instanceof MinecartTNT) { // The check for explosion damage should be handled already... But... What ever... if (wcfg.blockTNTExplosions) { @@ -598,7 +600,7 @@ public void onEntityExplode(EntityExplodeEvent event) { } } } - } else if (ent instanceof TNTPrimed) { + } else if (ent instanceof TNTPrimed || ent instanceof MinecartTNT) { if (wcfg.blockTNTBlockDamage) { event.blockList().clear(); return;