Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-31 12:31:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sk89q/worldguard

Browse Source
This commit is contained in:
TheCutter 2014-06-14 21:36:06 +02:00
commit 2119b274fd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
View File

@ -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;
}
}

3
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
View File

@ -1482,6 +1482,9 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
continue;
}
}
} else {
// found non-matching part, stop checking this command
continue blocked;
}
}
}