From 9b47599d063c7c621115cdb0fc72146012537e09 Mon Sep 17 00:00:00 2001 From: PixelSergey Date: Sat, 31 Oct 2015 19:10:22 +0200 Subject: Fixed ugly stacktraces. And the associated bugs. --- chatalias.py | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/chatalias.py b/chatalias.py index 69ac343..e4f72d7 100755 --- a/chatalias.py +++ b/chatalias.py @@ -13,6 +13,7 @@ # for "unlimited" setting. from helpers import * +from traceback import format_exc as trace def safe_open_json(): @@ -25,7 +26,7 @@ def safe_open_json(): @hook.command("alias", usage = "/ [to_alias] [alias...]", desc = "Aliases words in chat") def on_alias_command(sender, cmd, label, args): - + if not is_player(sender): msg(sender, "Sorry, Console cannot alias words") return True @@ -53,15 +54,25 @@ def on_alias_command(sender, cmd, label, args): elif len(args) == 1: data = safe_open_json() if args[0] == "*": - del data[str(sender.getUniqueId())] + try: + del data[str(sender.getUniqueId())] + except KeyError: + plugin_header(recipient = sender, name = "Chat Alias") + msg(sender, "No alias data to remove!") + return True save_json_file("aliases", data) plugin_header(recipient = sender, name = "Chat Alias") msg(sender, "ALL alias data successfuly removed!") return True - if data[str(sender.getUniqueId())].pop(args[0], None) is None: + try: + if data[str(sender.getUniqueId())].pop(args[0], None) is None: + plugin_header(recipient = sender, name = "Chat Alias") + msg(sender, "Could not remove: alias not present!") + return True + except KeyError: plugin_header(recipient = sender, name = "Chat Alias") - msg(sender, "Could not remove: alias not present!") + msg(sender, "Could not remove: you do not have any aliases!") return True save_json_file("aliases", data) @@ -95,12 +106,18 @@ def on_alias_command(sender, cmd, label, args): return False - @hook.event("player.AsyncPlayerChatEvent", "High") def on_player_chat(event): + playerid = str(event.getPlayer().getUniqueId()) + data = safe_open_json() + if event.isCancelled(): return - data = safe_open_json() - for alias, value in data[str(event.getPlayer().getUniqueId())].items(): + try: + crashtest = data[playerid].items() + except KeyError: + return + + for alias, value in data[playerid].items(): event.setMessage(event.getMessage().replace(alias, value)) -- cgit v1.2.3 From fe8461872f4f8bc778a05c46d5e4a2cf9dc2c536 Mon Sep 17 00:00:00 2001 From: PixelSergey Date: Sat, 31 Oct 2015 19:16:44 +0200 Subject: Fixed ugly stacktraces. And the associated bugs. --- chatalias.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 chatalias.py diff --git a/chatalias.py b/chatalias.py old mode 100755 new mode 100644 -- cgit v1.2.3 From 398533860bd5242d4089db154173d745d5dbd879 Mon Sep 17 00:00:00 2001 From: PixelSergey Date: Sat, 31 Oct 2015 19:59:55 +0200 Subject: Fixed ugly stacktraces. And the associated bugs. --- chatalias.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chatalias.py b/chatalias.py index e4f72d7..8c5c653 100644 --- a/chatalias.py +++ b/chatalias.py @@ -15,8 +15,12 @@ from helpers import * from traceback import format_exc as trace +global data = None def safe_open_json(): + global data + if data is not None: + return data data = open_json_file("aliases") if data is None: data = {"gnl":{"max_len":"35","max_entries":"10"}} -- cgit v1.2.3 From 97e2b80392a8235b1c0d518e4f1b7e86599cde98 Mon Sep 17 00:00:00 2001 From: Curs3d Date: Sat, 31 Oct 2015 20:08:29 +0200 Subject: Ate pugs. Fixed bugs. --- chatalias.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chatalias.py b/chatalias.py index 8c5c653..2c6ac8f 100644 --- a/chatalias.py +++ b/chatalias.py @@ -15,7 +15,7 @@ from helpers import * from traceback import format_exc as trace -global data = None +data = None def safe_open_json(): global data -- cgit v1.2.3 From 3f677467fced35b2084c01fa1173af88dadc7263 Mon Sep 17 00:00:00 2001 From: NEMESIS13cz Date: Sat, 31 Oct 2015 19:24:33 +0100 Subject: Fixed conflicts with chatalias --- mentio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mentio.py b/mentio.py index f6496a3..199eb8c 100644 --- a/mentio.py +++ b/mentio.py @@ -13,7 +13,7 @@ def saveMentions(): save_json_file("mentio", mentions) -@hook.event("player.AsyncPlayerChatEvent", "high") +@hook.event("player.AsyncPlayerChatEvent", "normal") def onChat(event): if not event.isCancelled(): sender = event.getPlayer() -- cgit v1.2.3 From dfa48d7da551db2abb1df965952dae5a5b8c424f Mon Sep 17 00:00:00 2001 From: NEMESIS13cz Date: Sat, 31 Oct 2015 19:31:32 +0100 Subject: This seems to fix everything --- mentio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mentio.py b/mentio.py index 199eb8c..fa46d71 100644 --- a/mentio.py +++ b/mentio.py @@ -13,7 +13,7 @@ def saveMentions(): save_json_file("mentio", mentions) -@hook.event("player.AsyncPlayerChatEvent", "normal") +@hook.event("player.AsyncPlayerChatEvent", "monitor") def onChat(event): if not event.isCancelled(): sender = event.getPlayer() -- cgit v1.2.3 From 626ec7f187e95e87d1c53ee2f3e3f930f3c414ea Mon Sep 17 00:00:00 2001 From: NEMESIS13cz Date: Sat, 31 Oct 2015 19:31:46 +0100 Subject: lowercase please --- chatalias.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chatalias.py b/chatalias.py index 2c6ac8f..dc7db72 100644 --- a/chatalias.py +++ b/chatalias.py @@ -110,7 +110,7 @@ def on_alias_command(sender, cmd, label, args): return False -@hook.event("player.AsyncPlayerChatEvent", "High") +@hook.event("player.AsyncPlayerChatEvent", "high") def on_player_chat(event): playerid = str(event.getPlayer().getUniqueId()) data = safe_open_json() -- cgit v1.2.3 From 438a2f702778d2455c3f1308f5b828a54b0067b3 Mon Sep 17 00:00:00 2001 From: NEMESIS13cz Date: Sun, 1 Nov 2015 14:08:48 +0100 Subject: Added permissions for warn and warnp --- misc.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/misc.py b/misc.py index e5727bc..c6da200 100644 --- a/misc.py +++ b/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) -- cgit v1.2.3 From cb8efcc767429125cf9aac6ebae0d08e26b8d2c7 Mon Sep 17 00:00:00 2001 From: NEMESIS13cz Date: Sun, 1 Nov 2015 14:09:01 +0100 Subject: fixed errors on login event --- iptracker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- cgit v1.2.3 From 670203522b16937d768046d3ae2b1a2c97d2685f Mon Sep 17 00:00:00 2001 From: NEMESIS13cz Date: Sun, 1 Nov 2015 14:09:13 +0100 Subject: Added permission for signalstrength --- signalstrength.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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:]) -- cgit v1.2.3