Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-28 05:25:20 +01:00
Code Issues Projects Releases Wiki Activity

Revert lighter changes for now. This brings back the odd behaviors between flint & steel and fire charges, but makes it more intuitive for protection.

Browse Source
This commit is contained in:
wizjany 2013-06-01 10:14:35 -04:00
parent 532a45f9e7
commit 2d9e95a63e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,7 +781,8 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
if (item.getTypeId() == ItemID.FIRE_CHARGE || item.getTypeId() == ItemID.FLINT_AND_TINDER) { if (item.getTypeId() == ItemID.FIRE_CHARGE || item.getTypeId() == ItemID.FLINT_AND_TINDER) {
if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world) if (!plugin.getGlobalRegionManager().hasBypass(localPlayer, world)
&& !placedInSet.allows(DefaultFlag.LIGHTER, localPlayer)) { && !plugin.canBuild(player, placedIn)
&& !placedInSet.allows(DefaultFlag.LIGHTER)) {
event.setCancelled(true); event.setCancelled(true);
event.setUseItemInHand(Result.DENY); event.setUseItemInHand(Result.DENY);
player.sendMessage(ChatColor.DARK_RED + "You're not allowed to use that here."); player.sendMessage(ChatColor.DARK_RED + "You're not allowed to use that here.");

2
src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java
View File

@ -40,7 +40,7 @@ public final class DefaultFlag {
public static final StateFlag OTHER_EXPLOSION = new StateFlag("other-explosion", true); public static final StateFlag OTHER_EXPLOSION = new StateFlag("other-explosion", true);
public static final StateFlag SLEEP = new StateFlag("sleep", true); public static final StateFlag SLEEP = new StateFlag("sleep", true);
public static final StateFlag TNT = new StateFlag("tnt", true, RegionGroup.ALL); public static final StateFlag TNT = new StateFlag("tnt", true, RegionGroup.ALL);
public static final StateFlag LIGHTER = new StateFlag("lighter", false, RegionGroup.NON_MEMBERS); public static final StateFlag LIGHTER = new StateFlag("lighter", false);
public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", true); public static final StateFlag FIRE_SPREAD = new StateFlag("fire-spread", true);
public static final StateFlag LAVA_FIRE = new StateFlag("lava-fire", true); public static final StateFlag LAVA_FIRE = new StateFlag("lava-fire", true);
public static final StateFlag LIGHTNING = new StateFlag("lightning", true); public static final StateFlag LIGHTNING = new StateFlag("lightning", true);