Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-10-07 02:57:28 +02:00
Code Issues Projects Releases Wiki Activity

Removed duplicate handling of lighter fire

Browse Source
This commit is contained in:
Wizjany 2011-06-10 01:41:59 -04:00
parent c472dc89ad
commit 22e84321fc
2 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,12 +289,14 @@ public void onBlockIgnite(BlockIgniteEvent event) {
event.setCancelled(true);
return;
}
/*
if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL) {
if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL
&& event.getPlayer() != null
&& !plugin.hasPermission(event.getPlayer(), "worldguard.override.lighter")) {
event.setCancelled(true);
return;
}
*/
if (wcfg.fireSpreadDisableToggle && isFireSpread) {
event.setCancelled(true);
return;
@ -324,16 +326,16 @@ public void onBlockIgnite(BlockIgniteEvent event) {
if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
LocalPlayer localPlayer = plugin.wrapPlayer(player);
if (cause == IgniteCause.FLINT_AND_STEEL
&& !set.canBuild(localPlayer)) {
event.setCancelled(true);
return;
}
if (cause == IgniteCause.FLINT_AND_STEEL
&& !set.allows(DefaultFlag.LIGHTER)) {
event.setCancelled(true);
return;
if (cause == IgniteCause.FLINT_AND_STEEL) {
if (!set.canBuild(localPlayer)) {
event.setCancelled(true);
return;
}
if (!set.allows(DefaultFlag.LIGHTER)
&& !plugin.hasPermission(player, "worldguard.override.lighter")) {
event.setCancelled(true);
return;
}
}
}

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

@ -338,13 +338,6 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
ConfigurationManager cfg = plugin.getGlobalStateManager();
WorldConfiguration wcfg = cfg.get(world);
if (wcfg.blockLighter && item.getType() == Material.FLINT_AND_STEEL) {
if (!plugin.hasPermission(player, "worldguard.lighter.override")) {
event.setCancelled(true);
return;
}
}
// Infinite stack removal
if ((type == Material.CHEST
|| type == Material.JUKEBOX
@ -390,15 +383,6 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
return;
}
if (item.getType() == Material.FLINT_AND_STEEL) {
if (!plugin.getGlobalRegionManager().hasBypass(player, world)
&& !set.allows(DefaultFlag.LIGHTER)
&& !plugin.hasPermission(player, "worldguard.lighter.override")) {
event.setCancelled(true);
return;
}
}
if (type == Material.CHEST
|| type == Material.JUKEBOX //stores the (arguably) most valuable item
|| type == Material.DISPENSER