I didn't like the fire name but whatever

2 files changed, 4 insertions, 4 deletions

diff --git a/util_events.py b/util_events.py
index 9d66943..7b56db7 100644
--- a/util_events.py
+++ b/util_events.py
@@ -23,7 +23,7 @@ class base_event():
             if prior == priority:
                 self._handlers[priorities.index(prior)].append(function)
 
-    def call(self,*args):
+    def fire(self,*args):
         for priority in self._handlers:
             for handler in priority:
                 handler(self,*args)
@@ -45,7 +45,7 @@ def add_event(event_name, event_class = base_event):
     event = event_class(event_name)
     events.append(event)
 
-def call_event(event_name,*args):
+def fire_event(event_name,*args):
     """
       # Calls the ehe event with the given arguments
     """
diff --git a/wrapper_command.py b/wrapper_command.py
index ef463a8..41c7932 100644
--- a/wrapper_command.py
+++ b/wrapper_command.py
@@ -106,7 +106,9 @@ class Command(object):
     def execute_checks(self, sender, command, label, args):
 
         # ---- Check sender type ----
+        if is_player(sender):
             Validate.is_true(self.type != Command.SENDER_CONSOLE, "That command can only be used by the console")
+            sender = py_players[sender]
         else:
             Validate.is_true(self.type != Command.SENDER_PLAYER, "That command can only be used by players")
 
@@ -130,8 +132,6 @@ class Command(object):
                 return self.help()
 
         # ---- Set up passed arguments, prepare for handler call ----
-        if is_player(sender):
-            sender = py_players[sender]
         scape = Command_scape(args, self.arguments, command, label)
         if is_player(sender):
             sender = py_players[sender]