Removed unnessecary debug outputs

blockplacemods.py

@@ -151,7 +151,6 @@ def toggle_command(sender, command, label, args):
             if enabled:
                 del values[uuid]
             return " &aDisabled " + details[1]
-            return " &cAlready disabled: " + details[1]
 
         if arg2 == "details":
             return " &aSetting %s:\n &9%s \n&6Accepted arguments: [<slot>|clear|details]" % (setting, details[2])

chatalias.py

@@ -11,7 +11,6 @@
 ############################################
 
 import os
-import mysqlhack
 import org.bukkit as bukkit
 from org.bukkit import *
 from helpers import *
@@ -27,7 +26,6 @@ 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:
@@ -55,7 +53,6 @@ permission_FINFO = "utils.alias.finfo"
 # CODE #
 ########
 
-# OnEnable
 enabled = helpers_version in helpers_versions
 if not enabled:
     error = colorify("&6Incompatible versions detected (&chelpers.py&6)")
@@ -119,12 +116,13 @@ def help(sender, args):
     for message in to_display:
         msg(sender, message)
     if page+1 < pages:
-        msg(sender, colorify("&6To display the next page, type &c/alias help " + str(page+2)))
+        msg(sender, colorify("&6To display the next page, type &c/help " + str(page+2)))
     return True
 
 
 @hook.event("player.PlayerJoinEvent", "high")
 def on_join(event):
+    try:
         if enabled:
             t = threading.Thread(target=load_data, args=(uid(event.getPlayer()), ))
             t.daemon = True
@@ -132,6 +130,8 @@ def on_join(event):
         else:
             if event.getPlayer().hasPermission(permission_FINFO):
                 disabled_fallback(event.getPlayer())
+    except:
+        print(trace())
 
 
 @hook.event("player.AsyncPlayerChatEvent", "high")
@@ -153,8 +153,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,13 +185,8 @@ 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!")
@@ -201,6 +195,12 @@ 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])
@@ -225,10 +225,11 @@ 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:
@@ -274,21 +275,12 @@ 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:
         return subcommands["help"](sender, ["2"])
 
 
 def load_data(uuid):
-    try:
-        load_data_thread(uuid)
-#        t = threading.Thread(target=load_data_thread, args=(uuid))
-#        t.daemon = True
-#        t.start()
-    except:
-        print(trace())
-
-def load_data_thread(uuid):
     if use_mysql:
         conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
         curs = conn.cursor()
@@ -303,15 +295,6 @@ def load_data_thread(uuid):
 
 
 def save_data(uuid):
-    try:
-        save_data_thread(uuid)
-#        t = threading.Thread(target=save_data_thread, args=(uuid))
-#        t.daemon = True
-#        t.start()
-    except:
-        print(trace())
-
-def save_data_thread(uuid):
     if use_mysql:
         conn = zxJDBC.connect(mysql_database, mysql_user, mysql_pass, "com.mysql.jdbc.Driver")
         curs = conn.cursor()
@@ -319,8 +302,8 @@ def save_data_thread(uuid):
     else:
         save_json_file("aliases/" + uuid, data[uuid])
 
-
 # Subcommands:
+
 subcommands = {
     "help": help,
     "add": add,

damnspam.py

@@ -47,6 +47,8 @@ def on_dammnspam_command(sender, command, label, args):
             timeout_on  = round(float(timeout_on), 2)
             timeout_off = timeout_on
             if 60 >= timeout_on <= -2 or timeout_on == 0:
+                timeout_on = False
+            if timeout_on == False:
                 msg(sender, "&cThe timeout must be within 0-60 or -1.")
                 return True
         except ValueError:

helpers.py

@@ -314,13 +314,3 @@ def array_to_list(array):
     for a in array:
         return_list += [a]
     return return_list
-
-
-#debug wrapper
-def debug(func):
-    def wrap(*args, **kwargs):
-        try:
-            func(*args, **kwargs)
-        except:
-            print(trace())
-    return wrap