diff options
Diffstat (limited to 'EssentialsAntiBuild/src')
-rw-r--r-- | EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java | 17 | ||||
-rw-r--r-- | EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java | 6 |
2 files changed, 20 insertions, 3 deletions
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")); |