Cleaned up some of helpers.py

3 files changed, 4 insertions, 28 deletions

diff --git a/chatalias.py b/chatalias.py
index 0e2b297..bc21e13 100644
--- a/chatalias.py
+++ b/chatalias.py
@@ -5,8 +5,6 @@ import mysqlhack
 import org.bukkit as bukkit
 from org.bukkit import *
 from helpers import *
-from traceback import format_exc as trace
-from secrets import *
 
 # Version number and requirements
 
@@ -208,7 +206,7 @@ def is_alias_limit_reached(player, recipient, not_silent = False):
     if player.hasPermission(permission_ALL):
         return False
     alias_limit = int(get_permission_content(player, permission_AMOUNT))
-    if len(data[uid(player)]) > alias_limit:
+    if len(data[uid(player)]) >= alias_limit:
         message = ("&cYour limit of %d has been reached" if player is recipient else "&cThe limit of %d has been reached for that player") % alias_limit
         msg(recipient, message)
         if not_silent:
diff --git a/helpers.py b/helpers.py
index 4c32e24..d6e46bd 100755
--- a/helpers.py
+++ b/helpers.py
@@ -11,8 +11,6 @@ import org.bukkit.block as bblock
 import org.bukkit.event.entity as entity
 import org.bukkit.command.ConsoleCommandSender
 from org.bukkit.entity import *
-from player import get_py_player
-from player import py_players
 
 #Imports for async query
 from secrets import *
@@ -254,19 +252,6 @@ def save_json_file(filename, obj):
         error("Failed to write to %s: %s" % (filename, e))
 
 
-def toggle(player, ls, name = "Toggle", add = None):
-    """
-    Toggles presence of a player's UUID in a list
-    If add is given, True explicitely adds it whereas False removes it
-    """
-    pid = uid(player)
-    if pid in ls or add == False:
-        ls.remove(pid)
-        msg(player, "&a%s turned off!" % name)
-    elif add != False:
-        ls.append(pid)
-        msg(player, "&a%s turned on!" % name)
-
 def send_JSON_message(playername, message):
     bukkit.Bukkit.getServer().dispatchCommand(bukkit.Bukkit.getServer().getConsoleSender(), "tellraw " + playername + " " + message)
 
@@ -298,21 +283,13 @@ def get_permission_content(player, permnode):
     perms = player.getEffectivePermissions()
     for perm in perms:
         if str(perm.getPermission()).startswith(permnode):
-               return str(perm.getPermission()).replace(permnode, "")
-
-
-# Gets an online player from their name
-def get_player(name):
-    for p in bukkit.Bukkit.getServer().getOnlinePlayers():
-        if p.getName().lower() == name.lower():
-            return p
-    return None
+               return str(perm.getPermission())[len(permnode):]
 
 
 def array_to_list(array):
     return_list = []
     for a in array:
-        return_list += [a]
+        return_list.append(a)
     return return_list
 
 
diff --git a/loginsecurity.py b/loginsecurity.py
index edf51e9..4fbb307 100644
--- a/loginsecurity.py
+++ b/loginsecurity.py
@@ -7,6 +7,7 @@ from login_secrets import * #Don't forget to make login_secrets aswell
 import mysqlhack
 from com.ziclix.python.sql import zxJDBC
 from java.lang import Runnable
+from player import get_py_player, py_players
 
 wait_time = 30 #seconds
 admin_perm = "utils.loginsecurity.admin"