Tnt flag now prevents explosions from TntMinecarts.

jcdesimp · Apr 19, 2014 · 7564798 · 7564798
1 parent d358c87
commit 7564798
Showing 1 changed file with 32 additions and 8 deletions.
diff --git a/src/com/jcdesimp/landlord/landFlags/TntDamage.java b/src/com/jcdesimp/landlord/landFlags/TntDamage.java
@@ -73,9 +73,10 @@ public TntDamage() {
      */
     @EventHandler(priority = EventPriority.HIGH)
     public void tntExplode( EntityExplodeEvent event ){
-        if(!event.getEntityType().equals(EntityType.PRIMED_TNT)){
+        if(!(event.getEntityType().equals(EntityType.PRIMED_TNT))){
             return;
         }
+
         TNTPrimed tnt = (TNTPrimed)event.getEntity();
         OwnedLand land = OwnedLand.getApplicableLand(event.getLocation());
         if(land == null){
@@ -98,13 +99,7 @@ public void tntExplode( EntityExplodeEvent event ){
             Block block = it.next();
             OwnedLand lnd = OwnedLand.getApplicableLand(block.getLocation());
             if (lnd != null && !lnd.canEveryone(this) ) {
-                if(tnt.getSource()!=null){
-                    Player p = (Player)tnt.getSource();
-                    if(!lnd.hasPermTo(p, this)){
-                        it.remove();
-                    }
-
-                } else {
+                if (!(tnt.getSource() instanceof Player) || !lnd.hasPermTo((Player) tnt.getSource(), this)) {
                     it.remove();
                 }
 
@@ -114,6 +109,35 @@ public void tntExplode( EntityExplodeEvent event ){
 
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void tntMinecartExplode( EntityExplodeEvent event ){
+        if(!event.getEntityType().equals(EntityType.MINECART_TNT)){
+            return;
+        }
+
+        OwnedLand land = OwnedLand.getApplicableLand(event.getLocation());
+        if (land != null) {
+            if(!land.canEveryone(this)){
+                event.setCancelled(true);
+                return;
+            }
+
+        }
+
+        List<Block> destroyed = event.blockList();
+        Iterator<Block> it = destroyed.iterator();
+        while (it.hasNext()) {
+            Block block = it.next();
+            OwnedLand lnd = OwnedLand.getApplicableLand(block.getLocation());
+            if (lnd != null && !lnd.canEveryone(this)) {
+                it.remove();
+            }
+
+        }
+
+
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void igniteTnt(PlayerInteractEvent event){