summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalodev@gmx.co.uk>2012-06-26 23:31:38 +0100
committerementalo <ementalodev@gmx.co.uk>2012-06-26 23:31:38 +0100
commit68463b4af89a7b300fdad42139868e59b381f584 (patch)
treef36534b19d939d4c37043a983a083e6a750a282a
parent1596ea1335852054c11f6aa7c179959292c70228 (diff)
downloadEssentials-68463b4af89a7b300fdad42139868e59b381f584.tar
Essentials-68463b4af89a7b300fdad42139868e59b381f584.tar.gz
Essentials-68463b4af89a7b300fdad42139868e59b381f584.tar.lz
Essentials-68463b4af89a7b300fdad42139868e59b381f584.tar.xz
Essentials-68463b4af89a7b300fdad42139868e59b381f584.zip
Add some default values to protect config.
Figure out a better way to do this for HashMaps....
-rw-r--r--Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java8
-rw-r--r--Essentials/src/com/earth2me/essentials/settings/protect/Protect.java8
2 files changed, 15 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java b/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java
index 0713237dd..446b6e138 100644
--- a/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java
+++ b/Essentials/src/com/earth2me/essentials/settings/protect/Prevent.java
@@ -17,7 +17,7 @@ public class Prevent implements StorageObject
{
@Comment("Which blocks should a piston not be able to push?")
@ListType(Material.class)
- private Set<Material> pistonPush = new HashSet<Material>();
+ private Set<Material> pistonPush = new HashSet<Material>();
private boolean lavaFlow = false;
private boolean waterFlow = false;
// private boolean waterbucketFlow = false; TODO: Test if this still works
@@ -42,4 +42,10 @@ public class Prevent implements StorageObject
@MapKeyType(EntityType.class)
@MapValueType(Boolean.class)
private Map<EntityType, Boolean> spawn = new HashMap<EntityType, Boolean>();
+
+ public Prevent()
+ {
+ spawn.put(EntityType.PIG, false);
+ pistonPush.add(Material.GLASS);
+ }
} \ No newline at end of file
diff --git a/Essentials/src/com/earth2me/essentials/settings/protect/Protect.java b/Essentials/src/com/earth2me/essentials/settings/protect/Protect.java
index bb745ad8f..f7264ded2 100644
--- a/Essentials/src/com/earth2me/essentials/settings/protect/Protect.java
+++ b/Essentials/src/com/earth2me/essentials/settings/protect/Protect.java
@@ -3,6 +3,7 @@ package com.earth2me.essentials.settings.protect;
import com.earth2me.essentials.storage.Comment;
import com.earth2me.essentials.storage.ListType;
import com.earth2me.essentials.storage.StorageObject;
+import com.sun.org.apache.xml.internal.security.Init;
import java.util.HashSet;
import java.util.Set;
import lombok.Data;
@@ -42,4 +43,11 @@ public class Protect implements StorageObject
private boolean disableThunder = false;
private boolean disableLighting = false;
private SignsAndRails signsAndRails = new SignsAndRails();
+
+ public Protect()
+ {
+ alertOnPlacement.add(Material.LAVA);
+ alertOnUse.add(Material.LAVA_BUCKET);
+ alertOnBreak.add(Material.GLASS);
+ }
}