summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2012-10-15 23:34:13 +0200
committersnowleo <schneeleo@gmail.com>2012-10-15 23:34:13 +0200
commit80bdae2cc9f6af206f3b96d771dbd9b2b34ccaaa (patch)
treef96df947cd84ee03831da3f30be7908097590f06
parentd82899ebd669c9f8cf29cb6cca215e0c0a41180a (diff)
downloadEssentials-80bdae2cc9f6af206f3b96d771dbd9b2b34ccaaa.tar
Essentials-80bdae2cc9f6af206f3b96d771dbd9b2b34ccaaa.tar.gz
Essentials-80bdae2cc9f6af206f3b96d771dbd9b2b34ccaaa.tar.lz
Essentials-80bdae2cc9f6af206f3b96d771dbd9b2b34ccaaa.tar.xz
Essentials-80bdae2cc9f6af206f3b96d771dbd9b2b34ccaaa.zip
Add config option for /near default radius
-rw-r--r--Essentials/src/net/ess3/commands/Commandnear.java4
-rw-r--r--Essentials/src/net/ess3/settings/Commands.java3
-rw-r--r--Essentials/src/net/ess3/settings/commands/Near.java15
3 files changed, 19 insertions, 3 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandnear.java b/Essentials/src/net/ess3/commands/Commandnear.java
index f41c99907..db22e249f 100644
--- a/Essentials/src/net/ess3/commands/Commandnear.java
+++ b/Essentials/src/net/ess3/commands/Commandnear.java
@@ -14,7 +14,7 @@ public class Commandnear extends EssentialsCommand
@Override
protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
{
- long radius = 200;
+ long radius = ess.getSettings().getData().getCommands().getNear().getDefaultRadius();
IUser otherUser = null;
@@ -63,7 +63,7 @@ public class Commandnear extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
final IUser otherUser = ess.getUserMap().matchUser(args[0], false);
- long radius = 200;
+ long radius = ess.getSettings().getData().getCommands().getNear().getDefaultRadius();
if (args.length > 1)
{
try
diff --git a/Essentials/src/net/ess3/settings/Commands.java b/Essentials/src/net/ess3/settings/Commands.java
index 39c0f4203..fa23f6583 100644
--- a/Essentials/src/net/ess3/settings/Commands.java
+++ b/Essentials/src/net/ess3/settings/Commands.java
@@ -23,10 +23,11 @@ public class Commands implements StorageObject
private Home home = new Home();
private Lightning lightning = new Lightning();
private net.ess3.settings.commands.List list = new net.ess3.settings.commands.List();
+ private Near near = new Near();
+ private SocialSpy socalspy = new SocialSpy();
private Spawnmob spawnmob = new Spawnmob();
private Tpa tpa = new Tpa();
private Speed speed = new Speed();
- private SocialSpy socalspy = new SocialSpy();
@ListType
@Comment(
{
diff --git a/Essentials/src/net/ess3/settings/commands/Near.java b/Essentials/src/net/ess3/settings/commands/Near.java
new file mode 100644
index 000000000..1d94b48ea
--- /dev/null
+++ b/Essentials/src/net/ess3/settings/commands/Near.java
@@ -0,0 +1,15 @@
+package net.ess3.settings.commands;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import net.ess3.storage.Comment;
+import net.ess3.storage.StorageObject;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Near implements StorageObject
+{
+ @Comment("Radius of the near command, if no number is given.")
+ private int defaultRadius = 200;
+}