From f7a0bf03527d8585b01ca12d99682eb2c13f8596 Mon Sep 17 00:00:00 2001 From: neersighted Date: Tue, 6 Mar 2012 10:17:49 -0800 Subject: [PATCH] Fixed bug in .kill --- plugins/violence.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/violence.py b/plugins/violence.py index 3701a28..41c6fee 100644 --- a/plugins/violence.py +++ b/plugins/violence.py @@ -159,7 +159,7 @@ kills = ["rips off 's and leaves them to die.", "slices 's off with a Katana", "throws to Cthulu!", "feeds to an owlbear.", - "turns into a snail, and then salts them.", + "turns into a snail, and salts them.", "snacks on 's .", "puts into a sack, throws the sack in the river, and hurls the river into space.", "goes bowling with 's head.", @@ -220,10 +220,10 @@ def kill(inp, me=None, nick=None, input=None, notice=None): return if inp == input.conn.nick.lower() or inp == "itself": - target = inp - else: target = nick + else: + target = inp msg = random.choice(kills) - msg = re.sub ('', target, target) - msg = re.sub ('', random.choice(body), target) + msg = re.sub ('', target, msg) + msg = re.sub ('', random.choice(body), msg) me(msg)