diff options
author | NEMESIS13cz <seke94@seznam.cz> | 2015-11-01 14:20:25 +0100 |
---|---|---|
committer | NEMESIS13cz <seke94@seznam.cz> | 2015-11-01 14:20:25 +0100 |
commit | 612b86c50ba1e41b7bf26872c5f14f6595dab240 (patch) | |
tree | fdb3b8d01ce774fddacaf260253c6c36c5460757 | |
parent | 7775e37a658755b1d3e289b907d10d7bb3d622f4 (diff) | |
parent | 670203522b16937d768046d3ae2b1a2c97d2685f (diff) |
Merge branch 'dev'
-rw-r--r-- | iptracker.py | 2 | ||||
-rw-r--r-- | misc.py | 10 | ||||
-rw-r--r-- | signalstrength.py | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/iptracker.py b/iptracker.py index 70cab1a..8bbd053 100644 --- a/iptracker.py +++ b/iptracker.py @@ -13,7 +13,7 @@ iptrack_permission = "utils.iptrack" @hook.event("player.PlayerJoinEvent", "low") def on_player_join(event): - t = threading.Thread(target=on_player_join_thread, args=(event)) + t = threading.Thread(target=on_player_join_thread, args=(event, )) t.daemon = True t.start() @@ -263,7 +263,10 @@ def on_modules_command(sender, command, label, args): amax = 0, helpSubcmd = True) def warn_command(sender, command, label, args): - broadcast(None, " &b= &2&lLag incoming! &r-%s" % sender.getDisplayName()) + if sender.hasPermission("utils.warn"): + broadcast(None, " &b= &2&lLag incoming! &r-%s" % sender.getDisplayName()) + else: + noperm(sender) @simplecommand("warnp", @@ -272,7 +275,10 @@ def warn_command(sender, command, label, args): amax = 0, helpSubcmd = True) def warnp_command(sender, command, label, args): - broadcast(None, " &b= &2&lPossible lag incoming! &r-%s" % sender.getDisplayName()) + if sender.hasPermission("utils.warnp"): + broadcast(None, " &b= &2&lPossible lag incoming! &r-%s" % sender.getDisplayName()) + else: + noperm(sender) diff --git a/signalstrength.py b/signalstrength.py index d51f35a..10a4933 100644 --- a/signalstrength.py +++ b/signalstrength.py @@ -109,7 +109,9 @@ def get_entire_container(container): helpSubcmd = True, senderLimit = 0) def on_signalstrength_command(sender, command, label, args): - + if not sender.hasPermission("utils.ss"): + noperm(sender) + return None if len(args) > 0 and args[0].lower() in ("default", "defaults", "setdefaults"): strength, item_type, item_data = get_data(sender, args[1:]) |