From ff46c2cf54f191db58d4d72302180a45c769ca4b Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Sat, 26 Apr 2014 11:31:19 -0400
Subject: [PATCH 1/3] Fixed logic error in blocked-cmds checkings. Closes
 WORLDGUARD-3048.

---
 .../com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
index 10688feb..7db7a929 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
@@ -1482,6 +1482,9 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
                                     continue;
                                 }
                             }
+                        } else {
+                            // found non-matching part, stop checking
+                            break blocked;
                         }
                     }
                 }

From 0dd9729b352e6415ae2cf92c19f757a6517d5e92 Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Tue, 29 Apr 2014 12:01:06 -0400
Subject: [PATCH 2/3] Fixed logic error in blocked-cmds for real this time.
 Closes WORLDGUARD-3050.

---
 .../com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
index 7db7a929..f53c753c 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
@@ -1483,8 +1483,8 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
                                 }
                             }
                         } else {
-                            // found non-matching part, stop checking
-                            break blocked;
+                            // found non-matching part, stop checking this command
+                            continue blocked;
                         }
                     }
                 }

From 22f45c45eeace7229ace0e51306b47dea3405547 Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Wed, 7 May 2014 13:05:51 -0400
Subject: [PATCH 3/3] Apply obsidian generator disabling to tripwire.

---
 .../com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
index 6dd9d2d0..08fd3b31 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
@@ -266,8 +266,9 @@ public void onBlockFromTo(BlockFromToEvent event) {
         }
 
         if (wcfg.disableObsidianGenerators && (isAir || isLava)
-                && blockTo.getTypeId() == 55) {
-            blockTo.setTypeId(0);
+                && (blockTo.getTypeId() == BlockID.REDSTONE_WIRE
+                    || blockTo.getTypeId() == BlockID.TRIPWIRE)) {
+            blockTo.setTypeId(BlockID.AIR);
             return;
         }
     }