From a2a43ed464edbafe9548c156371d8013cc9e054d Mon Sep 17 00:00:00 2001 From: Dico200 Date: Wed, 25 May 2016 16:13:36 +0200 Subject: Replace camelCase with _ stuff --- imbusy.py | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/imbusy.py b/imbusy.py index 8d7ae74..2baefa3 100644 --- a/imbusy.py +++ b/imbusy.py @@ -144,6 +144,7 @@ class CommandWrapper(Command): self.checker = checker def execute(self, sender, label, args): + info("/" + self.getLabel() + " executed by " + sender.getName()) try: if self.checker(sender, args): return self.wrapped.execute(sender, label, args) @@ -184,39 +185,40 @@ def on_player_command_preprocess(event): def replace_ess_commands(): try: - mapField = server.getPluginManager().getClass().getDeclaredField("commandMap") - mapField.setAccessible(True) - commandMap = mapField.get(server.getPluginManager()) + info("[imbusy] Wrapping ess commands") + map_field = server.getPluginManager().getClass().getDeclaredField("commandMap") + map_field.setAccessible(True) + command_map = map_field.get(server.getPluginManager()) - commandsField = commandMap.getClass().getDeclaredField("knownCommands") - commandsField.setAccessible(True) - map = commandsField.get(commandMap) + commands_field = command_map.getClass().getDeclaredField("knownCommands") + commands_field.setAccessible(True) + map = commands_field.get(command_map) - essMsgCmd = map.get("essentials:msg") - essReplyCmd = map.get("essentials:reply") - essTpaCmd = map.get("essentials:tpa") - essTpahereCmd = map.get("essentials:tpahere") + ess_msg_cmd = map.get("essentials:msg") + ess_reply_cmd = map.get("essentials:reply") + ess_tpa_cmd = map.get("essentials:tpa") + ess_tpahere_cmd = map.get("essentials:tpahere") - msgCmdWrapper = CommandWrapper(essMsgCmd, msg_command_checker) - replyCmdWrapper = CommandWrapper(essReplyCmd, reply_command_checker) - tpaCmdWrapper = CommandWrapper(essTpaCmd, tpa_command_checker) - tpahereCmdWrapper = CommandWrapper(essTpahereCmd, tpahere_command_checker) + msg_cmd_wrapper = CommandWrapper(ess_msg_cmd, msg_command_checker) + reply_cmd_wrapper = CommandWrapper(ess_reply_cmd, reply_command_checker) + tpa_cmd_wrapper = CommandWrapper(ess_tpa_cmd, tpa_command_checker) + tpahere_cmd_wrapper = CommandWrapper(ess_tpahere_cmd, tpahere_command_checker) iterator = map.entrySet().iterator() while iterator.hasNext(): entry = iterator.next() value = entry.getValue() - if value is essMsgCmd: - entry.setValue(msgCmdWrapper) + if value is ess_msg_cmd: + entry.setValue(msg_cmd_wrapper) info("[imbusy] wrapped /" + entry.getKey()) - elif value is essReplyCmd: - entry.setValue(replyCmdWrapper) + elif value is ess_reply_cmd: + entry.setValue(reply_cmd_wrapper) info("[imbusy] wrapped /" + entry.getKey()) - elif value is essTpaCmd: - entry.setValue(tpaCmdWrapper) + elif value is ess_tpa_cmd: + entry.setValue(tpa_cmd_wrapper) info("[imbusy] wrapped /" + entry.getKey()) - elif value is essTpahereCmd: - entry.setValue(tpahereCmdWrapper) + elif value is ess_tpahere_cmd: + entry.setValue(tpahere_cmd_wrapper) info("[imbusy] wrapped /" + entry.getKey()) except: -- cgit v1.2.3 From a532c6b42c2c2629c7772e5538012446047da197 Mon Sep 17 00:00:00 2001 From: Dico200 Date: Wed, 25 May 2016 18:18:27 +0200 Subject: Changed broadcast message, removed two debugs --- imbusy.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/imbusy.py b/imbusy.py index 2baefa3..4dc6f59 100644 --- a/imbusy.py +++ b/imbusy.py @@ -53,7 +53,7 @@ def on_busy_command(sender, cmd, label, args): msg(sender, "You cannot be even more focused than this without being a jedi!") else: busy_players.append(sender.getName()) - broadcast(None, "&c[&2Busy&c] &fNow busy: %s&r, don't even TRY bothering them!" % sender.getDisplayName()) + broadcast(None, "&c[&2Busy&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName()) elif args[0] == "off": try: @@ -144,7 +144,6 @@ class CommandWrapper(Command): self.checker = checker def execute(self, sender, label, args): - info("/" + self.getLabel() + " executed by " + sender.getName()) try: if self.checker(sender, args): return self.wrapped.execute(sender, label, args) @@ -185,7 +184,6 @@ def on_player_command_preprocess(event): def replace_ess_commands(): try: - info("[imbusy] Wrapping ess commands") map_field = server.getPluginManager().getClass().getDeclaredField("commandMap") map_field.setAccessible(True) command_map = map_field.get(server.getPluginManager()) -- cgit v1.2.3 From 00e38efd14eaa3261b1dd66f71157a7f048bd92c Mon Sep 17 00:00:00 2001 From: Dico200 Date: Wed, 25 May 2016 18:32:20 +0200 Subject: Added catcher for /mail send --- imbusy.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/imbusy.py b/imbusy.py index 4dc6f59..225862b 100644 --- a/imbusy.py +++ b/imbusy.py @@ -154,6 +154,7 @@ class CommandWrapper(Command): def tabComplete(self, sender, alias, args): return self.wrapped.tabComplete(sender, alias, args) + def msg_command_checker(sender, args): return len(args) <= 1 or whisper(sender, args[0]) @@ -172,6 +173,15 @@ def tpa_command_checker(sender, args): def tpahere_command_checker(sender, args): return tpa_command_checker(sender, args) +def mail_command_checker(sender, args): + if len(args) < 3 or args[0].lower() != "send": + return True + target = server.getPlayer(args[1]) + if target is not None and target is not sender and not sender.hasPermission(override_perm) and target.getName() in busy_players: + msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) + return False + return True + @hook.event("player.PlayerCommandPreprocessEvent", "monitor") def on_player_command_preprocess(event): @@ -196,11 +206,13 @@ def replace_ess_commands(): ess_reply_cmd = map.get("essentials:reply") ess_tpa_cmd = map.get("essentials:tpa") ess_tpahere_cmd = map.get("essentials:tpahere") + ess_mail_cmd = map.get("essentials:mail") msg_cmd_wrapper = CommandWrapper(ess_msg_cmd, msg_command_checker) reply_cmd_wrapper = CommandWrapper(ess_reply_cmd, reply_command_checker) tpa_cmd_wrapper = CommandWrapper(ess_tpa_cmd, tpa_command_checker) tpahere_cmd_wrapper = CommandWrapper(ess_tpahere_cmd, tpahere_command_checker) + mail_cmd_wrapper = CommandWrapper(ess_mail_cmd, mail_command_checker) iterator = map.entrySet().iterator() while iterator.hasNext(): @@ -218,6 +230,9 @@ def replace_ess_commands(): elif value is ess_tpahere_cmd: entry.setValue(tpahere_cmd_wrapper) info("[imbusy] wrapped /" + entry.getKey()) + elif value is ess_mail_cmd: + entry.setValue(mail_cmd_wrapper) + info("[imbusy] wrapped /" + entry.getKey()) except: error("[Imbusy] Failed to wrap essentials commands") -- cgit v1.2.3 From 8629b39ce10242da9d4686f6bb2dcd7c24b53832 Mon Sep 17 00:00:00 2001 From: Dico200 Date: Wed, 25 May 2016 18:41:42 +0200 Subject: Make /busy a toggle, move help page to /busy help. Changed a few messages --- imbusy.py | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/imbusy.py b/imbusy.py index 225862b..1fc9e63 100644 --- a/imbusy.py +++ b/imbusy.py @@ -40,34 +40,44 @@ def on_busy_command(sender, cmd, label, args): noperm(sender) return True + sender_name = sender.getName() + if len(args) == 0: - msg(sender, "This plugin allows being busy, and when turned on you will not receive any direct messages or tpa requests.") - msg(sender, "\nCommands:") - msg(sender, "/busy on: turns on busy mode") - msg(sender, "/busy off: turns off busy mode") - msg(sender, "/busy status [player]: shows your or [player]'s current busy status.") + if sender_name in busy_players: + busy_players.remove(sender_name) + msg(sender, "Your busy status was removed, you can be bothered again") + else: + busy_players.append(sender_name) + broadcast(None, "&c[&2Busy&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName()) elif len(args) == 1: - if args[0] == "on": - if sender.getName() in busy_players: + if args[0].lower() == "on": + if sender_name in busy_players: msg(sender, "You cannot be even more focused than this without being a jedi!") else: - busy_players.append(sender.getName()) + busy_players.append(sender_name) broadcast(None, "&c[&2Busy&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName()) - elif args[0] == "off": + elif args[0].lower() == "off": try: - busy_players.remove(sender.getName()) - msg(sender, "Master has sent /busy command, %s&r is freeee of bothering!" % sender.getDisplayName()) + busy_players.remove(sender_name) + msg(sender, "Your busy status was removed, you can be bothered again") except ValueError: msg(sender, "You are not busy! You cannot be even less busy! Are you perhaps bored?") - elif args[0] == "status": - if sender.getName() in busy_players: + elif args[0].lower() == "status": + if sender_name in busy_players: msg(sender, "You are super-duper busy and concentrated right now. Think, think, think!") else: msg(sender, "You are completely unable to focus right now.") + elif args[0].lower() in ("?", "help"): + msg(sender, "Let's you put yourself in busy status, preventing pms and tpa requests from other players") + msg(sender, "\nCommands:") + msg(sender, "/busy: toggles busy status") + msg(sender, "/busy on: turns on busy status") + msg(sender, "/busy off: turns off busy status") + msg(sender, "/busy status [player]: shows your or [player]'s current busy status.") else: unclear(sender) return False @@ -75,7 +85,7 @@ def on_busy_command(sender, cmd, label, args): elif len(args) == 2 and args[0] == "status": target = server.getPlayer(args[1]) if target is None: - msg(sender, "That player is not online, I doubt they are busy.") + msg(sender, "That player is not online, they may be busy IRL, we never know") elif target.getName() in busy_players: msg(sender, "Yes, %s&r is busy. Shhh..." % target.getDisplayName()) else: -- cgit v1.2.3 From 28afa1ddcf9d9d43c7cc076e6091b33452bf2b1c Mon Sep 17 00:00:00 2001 From: Dico200 Date: Wed, 25 May 2016 18:54:32 +0200 Subject: Changed debug output, tweaked [busy] broadcast prefix --- imbusy.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/imbusy.py b/imbusy.py index 1fc9e63..380c920 100644 --- a/imbusy.py +++ b/imbusy.py @@ -48,7 +48,7 @@ def on_busy_command(sender, cmd, label, args): msg(sender, "Your busy status was removed, you can be bothered again") else: 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: 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!") else: 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": try: @@ -184,6 +184,7 @@ def tpahere_command_checker(sender, args): return tpa_command_checker(sender, args) def mail_command_checker(sender, args): + info("Mail command executed") if len(args) < 3 or args[0].lower() != "send": return True target = server.getPlayer(args[1]) @@ -225,24 +226,26 @@ def replace_ess_commands(): mail_cmd_wrapper = CommandWrapper(ess_mail_cmd, mail_command_checker) iterator = map.entrySet().iterator() + wrapped_commands = [] while iterator.hasNext(): entry = iterator.next() value = entry.getValue() + changed = True if value is ess_msg_cmd: entry.setValue(msg_cmd_wrapper) - info("[imbusy] wrapped /" + entry.getKey()) elif value is ess_reply_cmd: entry.setValue(reply_cmd_wrapper) - info("[imbusy] wrapped /" + entry.getKey()) elif value is ess_tpa_cmd: entry.setValue(tpa_cmd_wrapper) - info("[imbusy] wrapped /" + entry.getKey()) elif value is ess_tpahere_cmd: entry.setValue(tpahere_cmd_wrapper) - info("[imbusy] wrapped /" + entry.getKey()) elif value is ess_mail_cmd: 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: error("[Imbusy] Failed to wrap essentials commands") -- cgit v1.2.3 From 89e3982a299d94173704784438ac9393ebd6acaf Mon Sep 17 00:00:00 2001 From: Dico200 Date: Thu, 26 May 2016 04:37:47 +0200 Subject: Implement some of pizza's changes from imbusy branch --- imbusy.py | 180 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 103 insertions(+), 77 deletions(-) diff --git a/imbusy.py b/imbusy.py index 380c920..2df0a03 100644 --- a/imbusy.py +++ b/imbusy.py @@ -1,99 +1,126 @@ -# I'M BUSY! Plugin by Curs3d # -############################## -# Concept by CookieManors :D # -# http://bit.ly/1GnNPW8 # -############################## -# This plugin permits users to -# send a command that renders -# them "busy", not letting them -# to get tpa requests or direct -# messages, except from console. -# On restart, all busy data will -# be cleared. +################################## +# I'M BUSY! Plugin by Curs3d # +# Concept by CookieManors :D # +################################## +# This plugin permits users to # +# send a command that renders # +# them "busy", not letting them # +# to get tpa requests or direct # +# messages, except from console. # +# On restart, all busy data will # +# be cleared. # +################################## from helpers import * -from basecommands import simplecommand import org.bukkit.command.Command as Command -from traceback import format_exc as trace -busy_players = [] +imbusy_version = "v1.1.0" + +base_permission = "utils.busy" # for /busy status +use_permission = "utils.busy.use" # for being busy +override_permission = "utils.busy.override" # for being able to bother busy people -def unclear(sender): - msg(sender, "Umm, what? Sorry, directions unclear, got head stuck in washing machine") +busy_players = [] -@hook.command("busy", - aliases = ["focus"], - usage = "/ ", - description = "Sets busy mode on, you cannot recieve tpas and MSGs" +@hook.command("imbusy", + aliases = ["busy"], + usage = "/ [on, off, status/check]", + description = "Offers control over your busy status" ) def on_busy_command(sender, cmd, label, args): - if not is_player(sender): - msg(sender, "Sorry, Console cannot be busy") - return True + msg(sender, "&7Sorry, Console cannot be busy") + return True plugin_header(recipient = sender, name = "I'M BUSY!") - if not sender.hasPermission("utils.busy.allowed"): + #args = array_to_list(args) + if not sender.hasPermission(base_permission): noperm(sender) return True + if len(args) == 0: + return toggle(sender) + + arg0 = args[0].lower() + if arg0 == "on": + return on(sender) + if arg0 == "off": + return off(sender) + if arg0 in ("status", "check"): + return status(sender, args[1:]) + return help(sender) + + +def toggle(sender): + if not sender.hasPermission(use_permission): + noperm(sender) + return True sender_name = sender.getName() + if sender_name in busy_players: + busy_players.remove(sender_name) + broadcast(None, colorify(sender.getDisplayName() + " &7is no longer busy...")) + else: + busy_players.append(sender_name) + broadcast(None, colorify(sender.getDisplayName() + " &7is now busy...")) + return True - if len(args) == 0: - if sender_name in busy_players: - busy_players.remove(sender_name) - msg(sender, "Your busy status was removed, you can be bothered again") - else: - busy_players.append(sender_name) - broadcast(None, "&c[&fBUSY&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName()) - elif len(args) == 1: - if args[0].lower() == "on": - if sender_name in busy_players: - msg(sender, "You cannot be even more focused than this without being a jedi!") - else: - busy_players.append(sender_name) - broadcast(None, "&c[&fBUSY&c] %s&r is now busy, don't even TRY bothering them!" % sender.getDisplayName()) - - elif args[0].lower() == "off": - try: - busy_players.remove(sender_name) - msg(sender, "Your busy status was removed, you can be bothered again") - except ValueError: - msg(sender, "You are not busy! You cannot be even less busy! Are you perhaps bored?") - - elif args[0].lower() == "status": - if sender_name in busy_players: - msg(sender, "You are super-duper busy and concentrated right now. Think, think, think!") - else: - msg(sender, "You are completely unable to focus right now.") - - elif args[0].lower() in ("?", "help"): - msg(sender, "Let's you put yourself in busy status, preventing pms and tpa requests from other players") - msg(sender, "\nCommands:") - msg(sender, "/busy: toggles busy status") - msg(sender, "/busy on: turns on busy status") - msg(sender, "/busy off: turns off busy status") - msg(sender, "/busy status [player]: shows your or [player]'s current busy status.") - else: - unclear(sender) - return False +def help(sender): + msg(sender, "Let's you put yourself in busy status, preventing pms and tpa requests from other players") + msg(sender, "\n&eCommands:") + msg(sender, "&e/busy &7- Toggles busy status") + msg(sender, "&e/busy on &7- Turns on busy status") + msg(sender, "&e/busy off &7- Turns off busy status") + msg(sender, "&e/busy status [player] &7- shows your or [player]'s current busy status") + return True - elif len(args) == 2 and args[0] == "status": - target = server.getPlayer(args[1]) + +def on(sender): + if not sender.hasPermission(use_permission): + noperm(sender) + return True + sender_name = sender.getName() + if sender_name in busy_players: + msg(sender, "&7You are already busy!") + return True + busy_players.append(sender_name) + broadcast(None, colorify(sender.getDisplayName() + " &7is now busy...")) + return True + + +def off(sender): + if not sender.hasPermission(use_permission): + noperm(sender) + return True + sender_name = sender.getName() + if sender_name not in busy_players: + msg(sender, "&7You are not busy! You cannot be even less busy! Are you perhaps bored?") + return True + busy_players.remove(sender_name) + broadcast(None, colorify(sender.getDisplayName() + " &7is no longer busy...")) + return True + + +def status(sender, args): + if not sender.hasPermission(base_permission): + noperm(sender) + return True + if len(args) == 0: + if sender.getName() in busy_players: + msg(sender, "&7You are currently busy.") + else: + msg(sender, "&7You are currently not busy.") + else: + target = server.getPlayer(args[0]) if target is None: - msg(sender, "That player is not online, they may be busy IRL, we never know") + msg(sender, "&7That player is not online") elif target.getName() in busy_players: - msg(sender, "Yes, %s&r is busy. Shhh..." % target.getDisplayName()) + msg(sender, "&7Player &e" + args[0] + " &7is currently busy.") else: - msg(sender, "No, you're good. Feel free to chat with %s&r!" % target.getDisplayName()) - - else: - unclear(sender) - return False + msg(sender, "&7Player &e" + args[0] + " &7is currently not busy.") return True @@ -109,14 +136,13 @@ def on_player_leave(event): reply_targets = {} -override_perm = "utils.imbusy.override" def whisper(sender, target_name): target = server.getPlayer(target_name) if target is not None: - if target is not sender and not sender.hasPermission(override_perm) and target.getName() in busy_players: + if target is not sender and not sender.hasPermission(override_permission) and target.getName() in busy_players: msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) return False @@ -132,7 +158,7 @@ def reply(sender): if sender.getName() in reply_targets: target = server.getPlayer(reply_targets[sender.getName()]) if target is not None: - if target is not sender and not sender.hasPermission(override_perm) and target.getName() in busy_players: + if target is not sender and not sender.hasPermission(override_permission) and target.getName() in busy_players: msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) return False @@ -175,7 +201,7 @@ def tpa_command_checker(sender, args): if len(args) == 0: return True target = server.getPlayer(args[0]) - if target is not None and target is not sender and not sender.hasPermission(override_perm) and target.getName() in busy_players: + if target is not None and target is not sender and not sender.hasPermission(override_permission) and target.getName() in busy_players: msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) return False return True @@ -188,7 +214,7 @@ def mail_command_checker(sender, args): if len(args) < 3 or args[0].lower() != "send": return True target = server.getPlayer(args[1]) - if target is not None and target is not sender and not sender.hasPermission(override_perm) and target.getName() in busy_players: + if target is not None and target is not sender and not sender.hasPermission(override_permission) and target.getName() in busy_players: msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) return False return True -- cgit v1.2.3 From 7a905643eb772fd15c9fbd92942655c66b8dff0d Mon Sep 17 00:00:00 2001 From: Dico200 Date: Sat, 28 May 2016 22:18:27 +0200 Subject: Enabled friends module, added friends check in imbusy, fixed small mistakes --- friends.py | 4 ++++ imbusy.py | 74 +++++++++++++++++++++++++++++++++++++++++++------------------- main.py | 2 ++ 3 files changed, 58 insertions(+), 22 deletions(-) diff --git a/friends.py b/friends.py index 870560e..130954a 100644 --- a/friends.py +++ b/friends.py @@ -5,6 +5,10 @@ friends = open_json_file("friends", {}) # {Player_UUID:[List_of_friend friend_join_sound = "random.orb" +def is_friend_of(player, other): + lst = friends.get(uid(player)) + return lst is not None and uid(other) in lst + @hook.event("player.PlayerJoinEvent", "high") # creates sound and sends a bold message on friend join def fjm(event): # friend join message diff --git a/imbusy.py b/imbusy.py index 2df0a03..c56ee69 100644 --- a/imbusy.py +++ b/imbusy.py @@ -12,6 +12,7 @@ ################################## from helpers import * +from friends import is_friend_of import org.bukkit.command.Command as Command imbusy_version = "v1.1.0" @@ -21,7 +22,7 @@ use_permission = "utils.busy.use" # for being busy override_permission = "utils.busy.override" # for being able to bother busy people -busy_players = [] +busy_players = {} # name : false/true where false is normal busy and true is super busy @hook.command("imbusy", @@ -51,6 +52,8 @@ def on_busy_command(sender, cmd, label, args): return off(sender) if arg0 in ("status", "check"): return status(sender, args[1:]) + if arg0 == "super": + return super_cmd(sender) return help(sender) @@ -60,11 +63,11 @@ def toggle(sender): return True sender_name = sender.getName() if sender_name in busy_players: - busy_players.remove(sender_name) - broadcast(None, colorify(sender.getDisplayName() + " &7is no longer busy...")) + del busy_players[sender_name] + broadcast(None, sender.getDisplayName() + " &7is no longer busy...") else: busy_players.append(sender_name) - broadcast(None, colorify(sender.getDisplayName() + " &7is now busy...")) + broadcast(None, sender.getDisplayName() + " &7is now busy...") return True @@ -75,6 +78,7 @@ def help(sender): msg(sender, "&e/busy on &7- Turns on busy status") msg(sender, "&e/busy off &7- Turns off busy status") msg(sender, "&e/busy status [player] &7- shows your or [player]'s current busy status") + msg(sender, "&e/busy super &7- sets your status to SUPER busy such that even friends can not bother you") return True @@ -83,11 +87,11 @@ def on(sender): noperm(sender) return True sender_name = sender.getName() - if sender_name in busy_players: + if busy_players.get(sender_name) is False: # can be None, False or True msg(sender, "&7You are already busy!") - return True - busy_players.append(sender_name) - broadcast(None, colorify(sender.getDisplayName() + " &7is now busy...")) + else: + busy_players[sender_name] = False # busy but not super busy + broadcast(None, sender.getDisplayName() + " &7is now busy...") return True @@ -99,8 +103,8 @@ def off(sender): if sender_name not in busy_players: msg(sender, "&7You are not busy! You cannot be even less busy! Are you perhaps bored?") return True - busy_players.remove(sender_name) - broadcast(None, colorify(sender.getDisplayName() + " &7is no longer busy...")) + del busy_players[sender_name] + broadcast(None, sender.getDisplayName() + " &7is no longer busy...") return True @@ -110,7 +114,10 @@ def status(sender, args): return True if len(args) == 0: if sender.getName() in busy_players: - msg(sender, "&7You are currently busy.") + if busy_players[sender_name] is False: + msg(sender, "&7You are currently busy.") + else: + msg(sender, "&7You are currently SUPER busy.") else: msg(sender, "&7You are currently not busy.") else: @@ -118,18 +125,33 @@ def status(sender, args): if target is None: msg(sender, "&7That player is not online") elif target.getName() in busy_players: - msg(sender, "&7Player &e" + args[0] + " &7is currently busy.") + if busy_players[target.getName()] is False: + msg(sender, "&7Player %s &7is currently busy." % target.getDisplayName()) + else: + msg(sender, "&7Player %s &7is currently SUPER busy." % target.getDisplayName()) else: - msg(sender, "&7Player &e" + args[0] + " &7is currently not busy.") + msg(sender, "&7Player %s &7is currently not busy." % target.getDisplayName()) + return True + + +def super_cmd(sender): + if not sender.hasPermission(use_permission): + noperm(sender) + return True + sender_name = sender.getName() + if busy_players.get(sender_name) is True: + msg(sender, "&7You are already SUPER busy!") + else: + busy_players[sender_name] = True # SUPER busy + broadcast(None, sender.getDisplayName() + " &7is now SUPER busy...") return True @hook.event("player.PlayerQuitEvent", "lowest") def on_player_leave(event): - try: - busy_players.remove(event.getPlayer().getName()) - except: - pass + player_name = event.getPlayer().getName() + if player_name in busy_players: + del busy_players[player_name] #---- Dicode for catching any bothering of busy people ---- @@ -138,11 +160,19 @@ def on_player_leave(event): reply_targets = {} +def can_send(sender, target): + if not target.getName() in busy_players: + return True + if target is sender or sender.hasPermission(override_permission): + return True + return busy_players[target.getName()] is False and is_friend_of(target, sender) + + def whisper(sender, target_name): target = server.getPlayer(target_name) if target is not None: - if target is not sender and not sender.hasPermission(override_permission) and target.getName() in busy_players: + if not can_send(sender, target): msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) return False @@ -158,7 +188,7 @@ def reply(sender): if sender.getName() in reply_targets: target = server.getPlayer(reply_targets[sender.getName()]) if target is not None: - if target is not sender and not sender.hasPermission(override_permission) and target.getName() in busy_players: + if not can_send(sender, target): msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) return False @@ -181,7 +211,7 @@ class CommandWrapper(Command): def execute(self, sender, label, args): try: - if self.checker(sender, args): + if not is_player(sender) or self.checker(sender, args): return self.wrapped.execute(sender, label, args) except: error(trace()) @@ -201,7 +231,7 @@ def tpa_command_checker(sender, args): if len(args) == 0: return True target = server.getPlayer(args[0]) - if target is not None and target is not sender and not sender.hasPermission(override_permission) and target.getName() in busy_players: + if target is not None and not can_send(sender, target): msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) return False return True @@ -214,7 +244,7 @@ def mail_command_checker(sender, args): if len(args) < 3 or args[0].lower() != "send": return True target = server.getPlayer(args[1]) - if target is not None and target is not sender and not sender.hasPermission(override_permission) and target.getName() in busy_players: + if target is not None and not can_send(sender, target): msg(sender, "&c[&fBUSY&c] %s&r is busy!" % target.getDisplayName()) return False return True diff --git a/main.py b/main.py index 651a547..64405eb 100644 --- a/main.py +++ b/main.py @@ -44,6 +44,8 @@ shared["load_modules"] = [ "calc", # Adds aliasing of chat words "chatalias", + # For players to point friends + "friends", # Plugin to locate laggy chunks. /lc lists chunks with more than n entities "lagchunks", # Adds /report and /rp, Stores reports with time and location -- cgit v1.2.3