summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/Mob.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java6
-rw-r--r--Essentials/src/config.yml2
3 files changed, 6 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java
index 76e21630e..5565cde3e 100644
--- a/Essentials/src/com/earth2me/essentials/Mob.java
+++ b/Essentials/src/com/earth2me/essentials/Mob.java
@@ -38,7 +38,7 @@ public enum Mob
BLAZE("Blaze", Enemies.ENEMY, CreatureType.BLAZE),
MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, CreatureType.MUSHROOM_COW),
MAGMACUBE("MagmaCube", Enemies.ENEMY, CreatureType.MAGMA_CUBE),
- SNOWMAN("Snowman", Enemies.FRIENDLY, CreatureType.SNOWMAN);
+ SNOWMAN("Snowman", Enemies.FRIENDLY, "", CreatureType.SNOWMAN);
public static final Logger logger = Logger.getLogger("Minecraft");
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 4fa67a72a..1e9f66c6e 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -189,13 +189,13 @@ public class Settings implements ISettings
@Override
public double getTeleportCooldown()
{
- return config.getDouble("teleport-cooldown", 60);
+ return config.getDouble("teleport-cooldown", 0);
}
@Override
public double getHealCooldown()
{
- return config.getDouble("heal-cooldown", 60);
+ return config.getDouble("heal-cooldown", 0);
}
@Override
@@ -246,7 +246,7 @@ public class Settings implements ISettings
@Override
public boolean getReclaimSetting()
{
- return config.getBoolean("reclaim-onlogout", true);
+ return config.getBoolean("reclaim-onlogout", false);
}
@Override
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 52c87bb4b..eef1d883d 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -415,6 +415,8 @@ protect:
villager: false
blaze: false
mushroom_cow: false
+ magma_cube: false
+ snowman: 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.