summaryrefslogtreecommitdiffstats
path: root/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
diff options
context:
space:
mode:
authorementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-06-05 19:09:29 +0000
committerementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-06-05 19:09:29 +0000
commit3c05ce0d634af8799c34e695167028e44bbe7b19 (patch)
tree863272e79205946586b108ce71ec8192e475e1c9 /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
parentc6ab274f2e8436c06473c42e285eab69eaa5d5ad (diff)
downloadEssentials-3c05ce0d634af8799c34e695167028e44bbe7b19.tar
Essentials-3c05ce0d634af8799c34e695167028e44bbe7b19.tar.gz
Essentials-3c05ce0d634af8799c34e695167028e44bbe7b19.tar.lz
Essentials-3c05ce0d634af8799c34e695167028e44bbe7b19.tar.xz
Essentials-3c05ce0d634af8799c34e695167028e44bbe7b19.zip
[trunk] Protect, more merges
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1586 e251c2fe-e539-e718-e476-b85c1f46cddb
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java')
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
index f3c7968aa..4029e273f 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
@@ -110,6 +110,13 @@ public class EssentialsProtectBlockListener extends BlockListener
event.setCancelled(true);
return;
}
+ if (event.getBlock().getType() == Material.OBSIDIAN ||
+ event.getBlock().getFace(BlockFace.DOWN).getType() == Material.OBSIDIAN)
+ {
+ event.setCancelled(EssentialsProtect.guardSettings.get("protect.prevent.portal-creation"));
+ return;
+ }
+
if ((event.getCause().equals(BlockIgniteEvent.IgniteCause.SPREAD)))
{
event.setCancelled(EssentialsProtect.guardSettings.get("protect.prevent.fire-spread"));
@@ -127,6 +134,11 @@ public class EssentialsProtectBlockListener extends BlockListener
event.setCancelled(EssentialsProtect.guardSettings.get("protect.prevent.lava-fire-spread"));
return;
}
+ if (event.getCause().equals(BlockIgniteEvent.IgniteCause.LIGHTNING))
+ {
+ event.setCancelled(EssentialsProtect.guardSettings.get("protect.prevent.lightning-fire-spread"));
+ return;
+ }
}
@Override