diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-21 16:58:02 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-21 16:58:02 +0000 |
| commit | 568a5561fcb755db2be10d61d68fa70edf18d64e (patch) | |
| tree | 09c83405c8e81933d203bc6c55c9476b46246835 /EssentialsProtect/src/com/earth2me | |
| parent | fb2c0d28524ffc7b43157270ffde7ead75da07f4 (diff) | |
| download | Essentials-568a5561fcb755db2be10d61d68fa70edf18d64e.tar Essentials-568a5561fcb755db2be10d61d68fa70edf18d64e.tar.gz Essentials-568a5561fcb755db2be10d61d68fa70edf18d64e.tar.lz Essentials-568a5561fcb755db2be10d61d68fa70edf18d64e.tar.xz Essentials-568a5561fcb755db2be10d61d68fa70edf18d64e.zip | |
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
Diffstat (limited to 'EssentialsProtect/src/com/earth2me')
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java | 7 |
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;
+ }
}
}
|