summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-03-23 10:16:38 +0000
committerKHobbits <rob@khobbits.co.uk>2012-03-23 10:16:38 +0000
commitc46f14665c0eeea0ebf64251e4cc773d7d2c8a55 (patch)
tree7e516431ccae55d74e9a829ba4854fe501531861
parent49cb482ca52f8138fc98a49db11d201f3e1e179e (diff)
downloadEssentials-c46f14665c0eeea0ebf64251e4cc773d7d2c8a55.tar
Essentials-c46f14665c0eeea0ebf64251e4cc773d7d2c8a55.tar.gz
Essentials-c46f14665c0eeea0ebf64251e4cc773d7d2c8a55.tar.lz
Essentials-c46f14665c0eeea0ebf64251e4cc773d7d2c8a55.tar.xz
Essentials-c46f14665c0eeea0ebf64251e4cc773d7d2c8a55.zip
Adding missing entities to Protect Spawn Blacklist
-rw-r--r--Essentials/src/config.yml31
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java2
2 files changed, 17 insertions, 16 deletions
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index dc9f41656..2399b9be9 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -462,30 +462,31 @@ protect:
entitytarget: false
# Prevent the spawning of creatures
spawn:
- chicken: false
- cow: false
creeper: false
- ghast: false
- giant: false
- monster: false
- pig: false
- pig_zombie: false
- sheep: false
skeleton: false
- slime: false
spider: false
- squid: false
+ giant: false
zombie: false
- wolf: false
- cave_spider: false
+ slime: false
+ ghast: false
+ pig_zombie: false
enderman: false
+ cave_spider: false
silverfish: false
- ender_dragon: false
- villager: false
blaze: false
- mushroom_cow: false
magma_cube: false
+ ender_dragon: false
+ pig: false
+ sheep: false
+ cow: false
+ chicken: false
+ squid: false
+ wolf: false
+ mushroom_cow: false
snowman: false
+ ocelot: false
+ iron_golem: false
+ villager: false
# Maximum height the creeper should explode. -1 allows them to explode everywhere.
# Set prevent.creeper-explosion to true, if you want to disable creeper explosions.
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
index fe3cadbbe..1868e20c1 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
@@ -274,7 +274,7 @@ public class EssentialsProtectEntityListener implements Listener
{
return;
}
- final CreatureType creature = event.getCreatureType();
+ final EntityType creature = event.getEntityType();
if (creature == null)
{
return;