diff options
author | ementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-26 21:36:51 +0000 |
---|---|---|
committer | ementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-26 21:36:51 +0000 |
commit | cc5eb6e3e1c014184a24d3750cf42276db6950ef (patch) | |
tree | 1b9013b84ab844dec46acff650104df991e4bc3c /EssentialsProtect/src/com/earth2me | |
parent | e2173660c588ca0607e6710f565bfda6d18fc777 (diff) | |
download | Essentials-cc5eb6e3e1c014184a24d3750cf42276db6950ef.tar Essentials-cc5eb6e3e1c014184a24d3750cf42276db6950ef.tar.gz Essentials-cc5eb6e3e1c014184a24d3750cf42276db6950ef.tar.lz Essentials-cc5eb6e3e1c014184a24d3750cf42276db6950ef.tar.xz Essentials-cc5eb6e3e1c014184a24d3750cf42276db6950ef.zip |
[trunk] cleanup, prevent lightning fire spread
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1280 e251c2fe-e539-e718-e476-b85c1f46cddb
Diffstat (limited to 'EssentialsProtect/src/com/earth2me')
2 files changed, 6 insertions, 25 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java index ab38761d1..640f70d8f 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java @@ -158,6 +158,12 @@ 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 diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index d38e89760..8de1ee701 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -68,30 +68,5 @@ public class EssentialsProtectPlayerListener extends PlayerListener { parent.alert(user, item.getType().toString(), "used: "); } - - /*if (item != null && item.getTypeId() == 323) - { - if (EssentialsProtect.genSettings.get("protect.protect.signs")) - { - if (user.isAuthorized("essentials.protect")) - { - - signBlockX = blockClicked.getX(); - signBlockY = blockClicked.getY(); - signBlockZ = blockClicked.getZ(); - - initialize(); - spData.insertProtectionIntoDb(user.getWorld().getName(), user.getName(), signBlockX, - signBlockY + 1, signBlockZ); - - if (EssentialsProtect.genSettings.get("protect.protect.block-below")) - { - spData.insertProtectionIntoDb(user.getWorld().getName(), user.getName(), signBlockX, - signBlockY, signBlockZ); - } - } - } - }*/ - } } |