diff options
| author | snowleo <schneeleo@gmail.com> | 2012-11-18 12:56:33 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-11-18 12:56:33 +0100 |
| commit | a59283b53a091ef9b5f5752f6501421900a4c700 (patch) | |
| tree | bb58bd7771b3e680e29dcf8c3fa3f0f682001a07 | |
| parent | bcc4bb39fa56edc090802f781f63fe4716109de7 (diff) | |
| download | Essentials-a59283b53a091ef9b5f5752f6501421900a4c700.tar Essentials-a59283b53a091ef9b5f5752f6501421900a4c700.tar.gz Essentials-a59283b53a091ef9b5f5752f6501421900a4c700.tar.lz Essentials-a59283b53a091ef9b5f5752f6501421900a4c700.tar.xz Essentials-a59283b53a091ef9b5f5752f6501421900a4c700.zip | |
Cleanup
| -rw-r--r-- | Essentials/src/net/ess3/settings/General.java | 12 | ||||
| -rw-r--r-- | EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java | 8 | ||||
| -rw-r--r-- | pom.xml | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/Essentials/src/net/ess3/settings/General.java b/Essentials/src/net/ess3/settings/General.java index 264406f84..775aa3ff9 100644 --- a/Essentials/src/net/ess3/settings/General.java +++ b/Essentials/src/net/ess3/settings/General.java @@ -51,7 +51,6 @@ public class General implements StorageObject " VAULT: Options are stored using a permissions plugin supported by Vault" }) private GroupStorage groupStorage = GroupStorage.FILE; - @Comment( { "Set to true to enable per-world permissions for teleporting between worlds with essentials commands", @@ -67,17 +66,18 @@ public class General implements StorageObject { return loginAttackDelay * 1000; } + + public void setLoginAttackDelay(long loginAttackDelay) + { + this.loginAttackDelay = loginAttackDelay / 1000; + } private Boolean metricsEnabled = null; - @Comment("The join message when players join the server") private String joinMessage = "&e{PLAYER} has joined the game"; - @Comment("The quit message when players leave the server") - private String leaveMessage ="&e{PLAYER} has left the game"; - + private String leaveMessage = "&e{PLAYER} has left the game"; @Comment("Enable this to clear powertools when a player disconnects.") private boolean ptClearOnQuit = false; - @Comment("Enable this to clear powertools when a player changes worlds.") private boolean ptClearOnWorldChange = false; } diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java b/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java index c0d42b443..206b4c72f 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java @@ -1,14 +1,11 @@ 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> @@ -18,8 +15,7 @@ public class AntiBuildHolder extends AsyncStorageObjectHolder<AntiBuild> super(ess, AntiBuild.class, new File(ess.getPlugin().getDataFolder(), "antibuild.yml")); onReload(); } - - + @Override public void fillWithDefaults() { @@ -28,6 +24,6 @@ public class AntiBuildHolder extends AsyncStorageObjectHolder<AntiBuild> blacklist.setupDefaults(); alert.setupDefaults(); getData().setAlert(alert); - getData().setBlacklist(blacklist); + getData().setBlacklist(blacklist); } } @@ -76,7 +76,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <bukkit.version>1.4.4-R0.1-SNAPSHOT</bukkit.version> + <bukkit.version>1.4.5-R0.1-SNAPSHOT</bukkit.version> <build.number>Unknown</build.number> <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> |