diff options
author | ementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-06-05 19:09:29 +0000 |
---|---|---|
committer | ementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-06-05 19:09:29 +0000 |
commit | 9a4ef7cd20c137c3f3af9bef13f1564c00ba5716 (patch) | |
tree | cf62fdb44bc4b76530e39eefa6682cb90bba51b8 /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java | |
parent | bc3d8d5ecec975b6a3da720bd03e174da84c7fac (diff) | |
download | Essentials-9a4ef7cd20c137c3f3af9bef13f1564c00ba5716.tar Essentials-9a4ef7cd20c137c3f3af9bef13f1564c00ba5716.tar.gz Essentials-9a4ef7cd20c137c3f3af9bef13f1564c00ba5716.tar.lz Essentials-9a4ef7cd20c137c3f3af9bef13f1564c00ba5716.tar.xz Essentials-9a4ef7cd20c137c3f3af9bef13f1564c00ba5716.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.java | 12 |
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 |