From 58cb8899983289a61748c145d1bb7fdc4df36abe Mon Sep 17 00:00:00 2001
From: Ne0n x3r0 <ne0nx3r0@gmail.com>
Date: Wed, 6 Feb 2013 13:41:10 -0600
Subject: [PATCH] Adding permissions example, cleaning things up for a release.
 Still need to do player alias testing. (irony)

---
 aliases.yml                                               | 8 ++++++++
 com/ne0nx3r0/betteralias/BetterAlias.java                 | 4 ++--
 ...layerListener.java => BetterAliasCommandListener.java} | 7 +++----
 plugin.yml                                                | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)
 rename com/ne0nx3r0/betteralias/listener/{BetterAliasPlayerListener.java => BetterAliasCommandListener.java} (88%)

diff --git a/aliases.yml b/aliases.yml
index 2f9712d..d7af289 100644
--- a/aliases.yml
+++ b/aliases.yml
@@ -41,6 +41,14 @@ handid:
 redText:
   0: reply Look at my &REDcolored &DARK_GREENtext!
   
+# User must have betteralias.staff permission or be the console.
+staff:
+  permission: staff
+  0:
+    - /seen Ne0nx3r0
+    - /seen someOtherStaffMember
+    - /seen someThirdStaffMember
+  
 # Console example
 # If this seems dangerous, that's because it is!
 #
diff --git a/com/ne0nx3r0/betteralias/BetterAlias.java b/com/ne0nx3r0/betteralias/BetterAlias.java
index 1ba4dab..f6b28b4 100644
--- a/com/ne0nx3r0/betteralias/BetterAlias.java
+++ b/com/ne0nx3r0/betteralias/BetterAlias.java
@@ -1,7 +1,7 @@
 package com.ne0nx3r0.betteralias;
 
 import com.ne0nx3r0.betteralias.alias.AliasManager;
-import com.ne0nx3r0.betteralias.listener.BetterAliasPlayerListener;
+import com.ne0nx3r0.betteralias.listener.BetterAliasCommandListener;
 import com.ne0nx3r0.betteralias.listener.command.BetterAliasCommandExecutor;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -14,7 +14,7 @@ public class BetterAlias extends JavaPlugin
     {
         this.aliasManager = new AliasManager(this);
         
-        this.getServer().getPluginManager().registerEvents(new BetterAliasPlayerListener(this), this);
+        this.getServer().getPluginManager().registerEvents(new BetterAliasCommandListener(this), this);
         
         
         BetterAliasCommandExecutor betterAliasCommandExecutor = new BetterAliasCommandExecutor(this);
diff --git a/com/ne0nx3r0/betteralias/listener/BetterAliasPlayerListener.java b/com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java
similarity index 88%
rename from com/ne0nx3r0/betteralias/listener/BetterAliasPlayerListener.java
rename to com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java
index 1ed9063..1a9110d 100644
--- a/com/ne0nx3r0/betteralias/listener/BetterAliasPlayerListener.java
+++ b/com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java
@@ -11,11 +11,11 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.server.ServerCommandEvent;
 
-public class BetterAliasPlayerListener implements Listener
+public class BetterAliasCommandListener implements Listener
 {
     private final BetterAlias plugin;
 
-    public BetterAliasPlayerListener(BetterAlias plugin)
+    public BetterAliasCommandListener(BetterAlias plugin)
     {
         this.plugin = plugin;
     }
@@ -31,8 +31,7 @@ public class BetterAliasPlayerListener implements Listener
             Player player = e.getPlayer();
             
             if(alias.hasPermission() 
-            && (!player.hasPermission("betteralias."+alias.getPermissionNode())
-                || player.isOp()))
+            && !player.hasPermission("betteralias."+alias.getPermissionNode()))
             {
                 player.sendMessage(ChatColor.RED+"You do not have permission to use this command.");
             }
diff --git a/plugin.yml b/plugin.yml
index 94dace8..8d3d7f2 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
 name: BetterAlias
 main: com.ne0nx3r0.betteralias.BetterAlias
-version: '2.0'
+version: '1.0'
 database: false
 description: Command alias system
 commands: