diff --git a/roles/craftbukkit/files/discord.py b/roles/craftbukkit/files/discord.py index 3649632..0b134ff 100644 --- a/roles/craftbukkit/files/discord.py +++ b/roles/craftbukkit/files/discord.py @@ -16,7 +16,8 @@ PATTERNS = ( (re.compile(r"(\S+) (joined|left) the game"), "{0} {1} the game"), (re.compile(r"\[(\S+): Gave (\d+) \[(.+)\] to (\S+)\]"), "{0} gave {1} \"{2}\" to {3}"), (re.compile(r"(\S+) was (\S+) by (\S+)"), ":skull: {0} was {1} by {2}"), - (re.compile(r"(\S+) tried to swim in lava"), "{0} tried to swim in lava"), + (re.compile(r"(\S+) tried to swim in lava"), ":skull: {0} tried to swim in lava"), + (re.compile(r"(\S+) fell from a high place"), ":skull: {0} fell from a high place"), ) diff --git a/roles/minecraft/files/minecraft-discord.py b/roles/minecraft/files/minecraft-discord.py index 2684309..0b134ff 100644 --- a/roles/minecraft/files/minecraft-discord.py +++ b/roles/minecraft/files/minecraft-discord.py @@ -12,9 +12,12 @@ from urlparse import urljoin PATTERN = re.compile(r"(\S+) (joined|left) the game") PATTERNS = ( + (re.compile(r": (\S+)\[.+logged in"), "{0} joined the game"), (re.compile(r"(\S+) (joined|left) the game"), "{0} {1} the game"), (re.compile(r"\[(\S+): Gave (\d+) \[(.+)\] to (\S+)\]"), "{0} gave {1} \"{2}\" to {3}"), (re.compile(r"(\S+) was (\S+) by (\S+)"), ":skull: {0} was {1} by {2}"), + (re.compile(r"(\S+) tried to swim in lava"), ":skull: {0} tried to swim in lava"), + (re.compile(r"(\S+) fell from a high place"), ":skull: {0} fell from a high place"), )