diff options
author | zenexer <zenexer@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-12 02:21:53 +0000 |
---|---|---|
committer | zenexer <zenexer@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-12 02:21:53 +0000 |
commit | ef292852397b24569377e34084471a4045c38a10 (patch) | |
tree | d9d806b7947ef0275817fd5336c4faf0b0923d06 | |
parent | 8641290caa813b1d96430c637ad9359a15b353b4 (diff) | |
download | Essentials-ef292852397b24569377e34084471a4045c38a10.tar Essentials-ef292852397b24569377e34084471a4045c38a10.tar.gz Essentials-ef292852397b24569377e34084471a4045c38a10.tar.lz Essentials-ef292852397b24569377e34084471a4045c38a10.tar.xz Essentials-ef292852397b24569377e34084471a4045c38a10.zip |
Added ability to disable nicknames by adding /nick to the disabled commands list
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1180 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r-- | Essentials/nbproject/private/private.properties | 1 | ||||
-rw-r--r-- | Essentials/nbproject/private/private.xml | 7 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 30 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 2 |
4 files changed, 9 insertions, 31 deletions
diff --git a/Essentials/nbproject/private/private.properties b/Essentials/nbproject/private/private.properties new file mode 100644 index 000000000..94183418a --- /dev/null +++ b/Essentials/nbproject/private/private.properties @@ -0,0 +1 @@ +user.properties.file=C:\\Users\\Paul\\.netbeans\\7.0beta2\\build.properties
diff --git a/Essentials/nbproject/private/private.xml b/Essentials/nbproject/private/private.xml new file mode 100644 index 000000000..8bc12f01c --- /dev/null +++ b/Essentials/nbproject/private/private.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+ <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+ <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+ <file>file:/C:/Users/Paul/Documents/NetBeansProjects/essentials~svn/trunk/Essentials/src/com/earth2me/essentials/Mob.java</file>
+ </open-files>
+</project-private>
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index a0504c99e..edba87daa 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -59,40 +59,10 @@ public class Essentials extends JavaPlugin Essentials ess = (Essentials)pm.getPlugin("Essentials"); if (!ess.isEnabled()) pm.enablePlugin(ess); - loadClasses(); } - @SuppressWarnings("CallToThreadDumpStack") public static void loadClasses() { - return; - /*final String[] classes = new String[] - { - "commands.IEssentialsCommand", - "commands.EssentialsCommand", - "User", - "TargetBlock", - "Spawn", - "Settings", - "OfflinePlayer", - "ItemDb", - "Mob", - "EssentialsBlockListener", - "EssentialsBlockListener$1", - "EssentialsBlockListener$2", - "EssentialsPlayerListener", - "Backup" - }; - - try - { - for (String c : classes) - Essentials.class.getClassLoader().loadClass("com.earth2me.essentials." + c); - } - catch (Throwable ex) - { - ex.printStackTrace(); - }*/ } public static Essentials getStatic() diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index c2159a17b..93bf5134a 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -678,7 +678,7 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo public String getNick() { Essentials ess = Essentials.getStatic(); - String name = ess.getConfiguration().getBoolean("disable-nick", false) ? getName() : ess.readNickname(this); + String name = Essentials.getSettings().isCommandDisabled("nick") ? getName() : ess.readNickname(this); if (isOp() && ess.getConfiguration().getString("ops-name-color", "c").matches("^[0-9a-f]$")) { name = "§" + ess.getConfiguration().getString("ops-name-color", "c") + name + "§f"; } |