[trunk] cleanup, prevent lightning fire spread

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1280 e251c2fe-e539-e718-e476-b85c1f46cddb

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);
-					}
-				}
-			}
-		}*/
-
 	}
 }