diff options
| author | snowleo <schneeleo@gmail.com> | 2011-11-28 06:15:51 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-11-28 06:15:51 +0100 |
| commit | e8d64aca5ebf6334844dbca80e83dd694557f862 (patch) | |
| tree | 9e7d3633ab5aadde6d34a40fb99fb690d2358bcf | |
| parent | b637e494c28884b2620014dde4fbc16eb595bf5c (diff) | |
| download | Essentials-e8d64aca5ebf6334844dbca80e83dd694557f862.tar Essentials-e8d64aca5ebf6334844dbca80e83dd694557f862.tar.gz Essentials-e8d64aca5ebf6334844dbca80e83dd694557f862.tar.lz Essentials-e8d64aca5ebf6334844dbca80e83dd694557f862.tar.xz Essentials-e8d64aca5ebf6334844dbca80e83dd694557f862.zip | |
New option for EssProtect: Prevent villager death.
3 files changed, 9 insertions, 0 deletions
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 52c87bb4b..c0358dec9 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -388,6 +388,7 @@ protect: creeper-playerdamage: false creeper-blockdamage: false enderman-pickup: false + villager-death: false # Monsters won't follow players # permission essentials.protect.entitytarget.bypass disables this entitytarget: false diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index 2c4d1dbab..cd054d732 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -32,6 +32,13 @@ public class EssentialsProtectEntityListener extends EntityListener return; } final Entity target = event.getEntity(); + + if (target instanceof Villager && prot.getSettingBool(ProtectConfig.prevent_villager_death)) + { + event.setCancelled(true); + return; + } + final User user = ess.getUser(target); if (event instanceof EntityDamageByBlockEvent) { diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java index 369e988ae..817ad66af 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java @@ -40,6 +40,7 @@ public enum ProtectConfig prevent_creeper_playerdmg("protect.prevent.creeper-playerdamage", false), prevent_creeper_blockdmg("protect.prevent.creeper-blockdamage", false), prevent_enderman_pickup("protect.prevent.enderman-pickup", false), + prevent_villager_death("protect.prevent.villager-death", false), prevent_entitytarget("protect.prevent.entitytarget", false), protect_rails("protect.protect.rails", true), protect_below_rails("protect.protect.block-below", true), |