Merge branch 'dev'
This commit is contained in:
@@ -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()
|
||||
|
||||
|
||||
10
misc.py
10
misc.py
@@ -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)
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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:])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user