diff options
4 files changed, 45 insertions, 45 deletions
diff --git a/Essentials/src/net/ess3/settings/antibuild/Alert.java b/Essentials/src/net/ess3/settings/antibuild/Alert.java index 28b59c3c2..7c2218372 100644 --- a/Essentials/src/net/ess3/settings/antibuild/Alert.java +++ b/Essentials/src/net/ess3/settings/antibuild/Alert.java @@ -33,25 +33,18 @@ public class Alert implements StorageObject @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private Set<Material> alertOnBreak = new HashSet<Material>(); - - public Alert() - { - if (alertOnPlacement.isEmpty()) - { - Material[] mat = - { - Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET - }; - alertOnPlacement.addAll(Arrays.asList(mat)); - } - if (alertOnUse.isEmpty()) + public void setupDefaults() + { + Material[] mat = { - alertOnUse.add(Material.LAVA_BUCKET); - } + Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET + }; + alertOnPlacement.addAll(Arrays.asList(mat)); + alertOnUse.add(Material.LAVA_BUCKET); } - public boolean getAlertOnPlacement(Material mat) + public boolean getAlertOnPlacementContains(Material mat) { if (alertOnPlacement == null) { @@ -60,7 +53,7 @@ public class Alert implements StorageObject return alertOnPlacement.contains(mat); } - public boolean getAlertOnUse(Material mat) + public boolean getAlertOnUseContains(Material mat) { if (alertOnUse == null) { @@ -69,7 +62,7 @@ public class Alert implements StorageObject return alertOnUse.contains(mat); } - public boolean getAlertOnBreak(Material mat) + public boolean getAlertOnBreakContains(Material mat) { if (alertOnBreak == null) { diff --git a/Essentials/src/net/ess3/settings/antibuild/BlackList.java b/Essentials/src/net/ess3/settings/antibuild/BlackList.java index 395314a12..c320d6d4e 100644 --- a/Essentials/src/net/ess3/settings/antibuild/BlackList.java +++ b/Essentials/src/net/ess3/settings/antibuild/BlackList.java @@ -50,56 +50,46 @@ public class BlackList implements StorageObject @Getter(AccessLevel.NONE) @Setter(AccessLevel.NONE) private Set<Material> piston = new HashSet<Material>(); - - public BlackList() + + public void setupDefaults() { - if(placement.isEmpty()) - { - Material[] mat = - { - Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET - }; - - placement.addAll(Arrays.asList(mat)); - } - - - if (usage.isEmpty()) + Material[] mat = { - usage.add(Material.LAVA_BUCKET); - } + Material.LAVA, Material.STATIONARY_LAVA, Material.TNT, Material.LAVA_BUCKET + }; + placement.addAll(Arrays.asList(mat)); } - + public boolean getPlacement(Material mat) { - if(placement == null) + if (placement == null) { - return false; + return false; } return placement.contains(mat); } - + public boolean getUsage(Material mat) { - if(usage == null) + if (usage == null) { return false; } return usage.contains(mat); } - + public boolean getBreaking(Material mat) { - if(breaking == null) + if (breaking == null) { return false; } return breaking.contains(mat); } - + public boolean getPiston(Material mat) { - if(piston == null) + if (piston == null) { return false; } diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java b/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java index 7e08defe8..c0d42b443 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java @@ -1,9 +1,14 @@ package net.ess3.antibuild; import java.io.File; +import java.util.Arrays; +import java.util.HashSet; import net.ess3.api.IEssentials; +import net.ess3.settings.antibuild.Alert; import net.ess3.settings.antibuild.AntiBuild; +import net.ess3.settings.antibuild.BlackList; import net.ess3.storage.AsyncStorageObjectHolder; +import org.bukkit.Material; public class AntiBuildHolder extends AsyncStorageObjectHolder<AntiBuild> @@ -13,4 +18,16 @@ public class AntiBuildHolder extends AsyncStorageObjectHolder<AntiBuild> super(ess, AntiBuild.class, new File(ess.getPlugin().getDataFolder(), "antibuild.yml")); onReload(); } + + + @Override + public void fillWithDefaults() + { + Alert alert = new Alert(); + BlackList blacklist = new BlackList(); + blacklist.setupDefaults(); + alert.setupDefaults(); + getData().setAlert(alert); + getData().setBlacklist(blacklist); + } } diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java index e07fa9616..2e0aba9a4 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java @@ -61,7 +61,7 @@ public class EssentialsAntiBuildListener implements Listener return; } - if (antib.getSettings().getData().getAlert().getAlertOnPlacement(type) + if (antib.getSettings().getData().getAlert().getAlertOnPlacementContains(type) && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) { antib.getEssentialsConnect().alert(user, type.toString(), _("alertPlaced")); @@ -98,7 +98,7 @@ public class EssentialsAntiBuildListener implements Listener return; } - if (antib.getSettings().getData().getAlert().getAlertOnBreak(type) + if (antib.getSettings().getData().getAlert().getAlertOnBreakContains(type) && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) { antib.getEssentialsConnect().alert(user, type.toString(), _("alertBroke")); @@ -172,7 +172,7 @@ public class EssentialsAntiBuildListener implements Listener } if (item != null - && antib.getSettings().getData().getAlert().getAlertOnUse(item.getType()) + && antib.getSettings().getData().getAlert().getAlertOnUseContains(item.getType()) && !Permissions.ALERTS_NOTRIGGER.isAuthorized(user)) { antib.getEssentialsConnect().alert(user, item.getType().toString(), _("alertUsed")); |