From fa1d5e900d13c546ddf069849e14eadafdc79377 Mon Sep 17 00:00:00 2001
From: Pepich <benedikt.abel@yahoo.de>
Date: Mon, 11 Apr 2016 16:59:42 +0200
Subject: Fixed player subcommand, removed debug outputs

---
 chatalias.py | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/chatalias.py b/chatalias.py
index a73decb..530cc90 100644
--- a/chatalias.py
+++ b/chatalias.py
@@ -11,6 +11,7 @@
 ############################################
 
 import os
+import mysqlhack
 import org.bukkit as bukkit
 from org.bukkit import *
 from helpers import *
@@ -26,6 +27,7 @@ error = colorify("&cUnspecified error")
 commands_per_page = 5
 global_aliases = {"./":"/"}
 data = {}
+# DON'T SET THIS TO TRUE! MySQL requestst are NOT async yet! (And for some reason it doesn't want to store any data ._.)
 use_mysql = False
 
 # Permissions:
@@ -83,7 +85,6 @@ def on_alias_command(sender, cmd, label, args):
             return True
         return subcommands[args[0].lower()](sender, args[1:])
     except:
-        print(trace())
         return subcommands["help"](sender, "1")
 
 
@@ -132,7 +133,7 @@ def on_join(event):
             if event.getPlayer().hasPermission(permission_FINFO):
                 disabled_fallback(event.getPlayer())
     except:
-        print(trace())
+        return
 
 
 @hook.event("player.AsyncPlayerChatEvent", "high")
@@ -154,7 +155,7 @@ def on_player_chat(event):
                 else:
                     event.setMessage(event.getMessage().replace(alias, value))
     except:
-        print(trace())
+        return
 
 def hasPerm(player, permission):
     return (player.hasPermission(permission)) or (player.hasPermission(permission_ALL))
@@ -186,8 +187,13 @@ def add(sender, args):
 
 
 def radd(sender, args):
-    args = [args[0:1]] + [" ".join([args[2:len(args)-2]])] + [args[len(args)-1]]
     plugin_header(sender, "Alias")
+    args = args[0:2] + [" ".join(args[2:len(args)-1])] + [args[len(args)-1]]
+    if is_player(sender):
+        sender_name = colorify(sender.getDisplayName())
+    else:
+        sender_name = colorify("&6Console")
+    target = get_player(args[0])
     if args[3].lower() == "false":
         plugin_header(target, "Alias")
         msg(target, "&cPlayer " + sender_name + " &cis creating an alias for you!")
@@ -196,12 +202,6 @@ def radd(sender, args):
         if args[3].lower() == "false":
             msg(target, "&cCould not create alias: Max_limit reached!")
         return True
-    
-    target = get_player(args[0])
-    if is_player(sender):
-        sender_name = colorify(sender.getDisplayName)
-    else:
-        sender_name = colorify("&6Console")
     if len(args) == 3:
         args += ["true"]
     data[str(uid(target))][str(args[1])] = str(args[2])
@@ -226,11 +226,10 @@ def rremove(sender, args):
     plugin_header(sender, "Alias")
     target = get_player(args[0])
     if is_player(sender):
-        sender_name = colorify(sender.getDisplayName)
+        sender_name = colorify(sender.getDisplayName())
     else:
         sender_name = colorify("&6Console")
     if args[2].lower() == "false":
-        print("WTF")
         plugin_header(target, "Alias")
         msg(target, "&cPlayer " + sender_name + " &cis removing an alias for you!")
     try:
@@ -276,13 +275,18 @@ def rlist_alias(sender, args):
 
 def remote(sender, args):
     try:
-        return remotes[args[1].lower()](sender, [args[0]] + [args[2:]])
+        return remotes[args[1].lower()](sender, [args[0]] + args[2:])
     except:
-        print(trace())
         return subcommands["help"](sender, ["2"])
 
-
 def load_data(uuid):
+    load_data_thread(uuid)
+#    t = threading.Thread(target=load_data_thread, args=(uuid))
+#    t.daemon = True
+#    t.start()
+
+
+def load_data_thread(uuid):
     if use_mysql:
         conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
         curs = conn.cursor()
@@ -295,8 +299,13 @@ def load_data(uuid):
     else:
         data[uuid] = safe_open_json(uuid)
 
-
 def save_data(uuid):
+    save_data_thread(uuid)
+#    t = threading.Thread(target=save_data_thread, args=(uuid))
+#    t.daemon = True
+#    t.start()
+
+def save_data_thread(uuid):
     if use_mysql:
         conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
         curs = conn.cursor()
-- 
cgit v1.2.3