aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnInternetTroll <lucafulger@gmail.com>2020-06-25 07:40:59 +0000
committerAnInternetTroll <lucafulger@gmail.com>2020-06-25 07:40:59 +0000
commit61bc1ec89bc62f12589558e1b942f6f57efb2ed8 (patch)
treebb8c27f68a9584cecd54cd92faebfb35ebedc0ec
parentea2f1214e5ace9b468beafb2595d13ef62116044 (diff)
parent4e2ee83356af6b50d06f990930dea16f6c19a9b1 (diff)
downloadsteve-bot-61bc1ec89bc62f12589558e1b942f6f57efb2ed8.tar
steve-bot-61bc1ec89bc62f12589558e1b942f6f57efb2ed8.tar.gz
steve-bot-61bc1ec89bc62f12589558e1b942f6f57efb2ed8.tar.bz2
steve-bot-61bc1ec89bc62f12589558e1b942f6f57efb2ed8.tar.lz
steve-bot-61bc1ec89bc62f12589558e1b942f6f57efb2ed8.tar.xz
steve-bot-61bc1ec89bc62f12589558e1b942f6f57efb2ed8.tar.zst
steve-bot-61bc1ec89bc62f12589558e1b942f6f57efb2ed8.zip
Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBot
Diffstat (limited to '')
-rwxr-xr-xbot.py4
-rwxr-xr-xcustom_commands.json2
-rwxr-xr-xmain.py4
3 files changed, 4 insertions, 6 deletions
diff --git a/bot.py b/bot.py
index 533b99d..d67dc3c 100755
--- a/bot.py
+++ b/bot.py
@@ -63,9 +63,7 @@ class BedrockBot(commands.Bot):
async def on_message(self, message):
- if message.author.bot:
- return
- if message.author.id in self.blacklist:
+ if message.author.bot or message.author.id in self.blacklist:
return
await self.process_commands(message)
diff --git a/custom_commands.json b/custom_commands.json
index 3ea311b..736cda3 100755
--- a/custom_commands.json
+++ b/custom_commands.json
@@ -36,4 +36,4 @@
"!src": "https://www.speedrun.com/mcbe",
"!mobiledupe": "1) place item to dupe in the crafting grid\n2) keep pressed until the green bar thing appears\nclick any \"Impossible\" craft (red ones)\n3)press the item to dupe (that is in your hotbar now -> it should have moved there since you pressed the impossible craft)\n4)your item should be duped",
"!source": "https://github.com/AnInternetTroll/mcbeDiscordBot"
-} \ No newline at end of file
+}
diff --git a/main.py b/main.py
index 9f713bf..13bc0f0 100755
--- a/main.py
+++ b/main.py
@@ -29,9 +29,9 @@ def run_bot():
bot.run()
if __name__ == "__main__":
-
+
init_colorama(autoreset=True)
setup_logging()
-
+
run_bot()