CB 697

Fixes spawning of web and new rails.
New config: Disable Lightning damage for players.

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

1 files changed, 6 insertions, 1 deletions

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index b0f0804cb..19c808d5f 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -111,7 +111,7 @@ public class EssentialsProtectEntityListener extends EntityListener
 				return;

 			}

 		}

-

+		

 		DamageCause cause = event.getCause();

 		Entity casualty = event.getEntity();

 		if (casualty instanceof Player)

@@ -138,6 +138,11 @@ public class EssentialsProtectEntityListener extends EntityListener
 				event.setCancelled(true);

 				return;

 			}

+			if (EssentialsProtect.playerSettings.get("protect.disable.lightning") && cause == DamageCause.LIGHTNING)

+			{

+				event.setCancelled(true);

+				return;

+			}

 		}

 	}