Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

Solidify imbusy blocking pms, tpas, etc. #42

Merged
Dico200 merged 8 commits from imbusy-reply-patch into dev 2016-05-28 20:22:01 +00:00
Conversation 0 Commits 8 Files Changed 3 +10 -7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28afa1ddcf - Show all commits

17
imbusy.py
View File

@ -48,7 +48,7 @@ def on_busy_command(sender, cmd, label, args):
msg(sender, "Your busy status was removed, you can be bothered again") msg(sender, "Your busy status was removed, you can be bothered again")
else: else:
busy_players.append(sender_name) busy_players.append(sender_name)
broadcast(None, "&c[&2Busy&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName()) broadcast(None, "&c[&fBUSY&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName())
elif len(args) == 1: elif len(args) == 1:
if args[0].lower() == "on": if args[0].lower() == "on":
@ -56,7 +56,7 @@ def on_busy_command(sender, cmd, label, args):
msg(sender, "You cannot be even more focused than this without being a jedi!") msg(sender, "You cannot be even more focused than this without being a jedi!")
else: else:
busy_players.append(sender_name) busy_players.append(sender_name)
broadcast(None, "&c[&2Busy&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName()) broadcast(None, "&c[&fBUSY&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName())
elif args[0].lower() == "off": elif args[0].lower() == "off":
try: try:
@ -184,6 +184,7 @@ def tpahere_command_checker(sender, args):
return tpa_command_checker(sender, args) return tpa_command_checker(sender, args)
def mail_command_checker(sender, args): def mail_command_checker(sender, args):
info("Mail command executed")
if len(args) < 3 or args[0].lower() != "send": if len(args) < 3 or args[0].lower() != "send":
return True return True
target = server.getPlayer(args[1]) target = server.getPlayer(args[1])
@ -225,24 +226,26 @@ def replace_ess_commands():
mail_cmd_wrapper = CommandWrapper(ess_mail_cmd, mail_command_checker) mail_cmd_wrapper = CommandWrapper(ess_mail_cmd, mail_command_checker)
iterator = map.entrySet().iterator() iterator = map.entrySet().iterator()
wrapped_commands = []
while iterator.hasNext(): while iterator.hasNext():
entry = iterator.next() entry = iterator.next()
value = entry.getValue() value = entry.getValue()
changed = True
if value is ess_msg_cmd: if value is ess_msg_cmd:
entry.setValue(msg_cmd_wrapper) entry.setValue(msg_cmd_wrapper)
info("[imbusy] wrapped /" + entry.getKey())
elif value is ess_reply_cmd: elif value is ess_reply_cmd:
entry.setValue(reply_cmd_wrapper) entry.setValue(reply_cmd_wrapper)
info("[imbusy] wrapped /" + entry.getKey())
elif value is ess_tpa_cmd: elif value is ess_tpa_cmd:
entry.setValue(tpa_cmd_wrapper) entry.setValue(tpa_cmd_wrapper)
info("[imbusy] wrapped /" + entry.getKey())
elif value is ess_tpahere_cmd: elif value is ess_tpahere_cmd:
entry.setValue(tpahere_cmd_wrapper) entry.setValue(tpahere_cmd_wrapper)
info("[imbusy] wrapped /" + entry.getKey())
elif value is ess_mail_cmd: elif value is ess_mail_cmd:
entry.setValue(mail_cmd_wrapper) entry.setValue(mail_cmd_wrapper)
info("[imbusy] wrapped /" + entry.getKey()) else:
changed = False
if changed:
wrapped_commands.append(entry.getKey())
info("[imbusy] wrapped commands: /" + ", /".join(wrapped_commands))
except: except:
error("[Imbusy] Failed to wrap essentials commands") error("[Imbusy] Failed to wrap essentials commands")