From 037ce461e878b2544d3a48fd517221c85dabff88 Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Mon, 15 Mar 2021 05:34:39 +0900 Subject: [PATCH] Saki Bot --- DiscordDivaBot/saki.jar | Bin 9713677 -> 9713670 bytes DiscordDivaBot/src/sig/Check.java | 6 ++++-- DiscordDivaBot/src/sig/DivaBot.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/DiscordDivaBot/saki.jar b/DiscordDivaBot/saki.jar index 8a7ebe83a934b09eda8afdc95a9ac98bb3e16fe2..97a3bef2f0849aa5d9953a6e7c48fa082198fde9 100644 GIT binary patch delta 5723 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 delta 5726 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 { + if (!dead&&System.currentTimeMillis()-lastChannelMessage>=10800000) { dead=true; - bot.getTextChannelById(744692511703826462l).sendMessage("<:sakiDead1:799650259487293440><:sakiDead2:799650259746947083>") + bot.getTextChannelById(772923108997857291l).sendMessage("<:sakiPls:820748397031718923><:sakiPls:820748397031718923>") .queue(); + /*bot.getTextChannelById(744692511703826462l).sendMessage("<:sakiPls:820748397031718923><:sakiPls:820748397031718923>") + .queue();*/ } } diff --git a/DiscordDivaBot/src/sig/DivaBot.java b/DiscordDivaBot/src/sig/DivaBot.java index f95dd9b..b8c91c3 100644 --- a/DiscordDivaBot/src/sig/DivaBot.java +++ b/DiscordDivaBot/src/sig/DivaBot.java @@ -72,7 +72,8 @@ public class DivaBot extends ListenerAdapter{ } }*/ - if (ev.getChannel().getIdLong()==772923108997857291l||ev.getChannel().getIdLong()==744692511703826462l) { + if ((ev.getChannel().getIdLong()==772923108997857291l/*||ev.getChannel().getIdLong()==744692511703826462l*/) + &&ev.getAuthor().getIdLong()!=809417111859888168l&&ev.getAuthor().getIdLong()!=820742054002294784l) { if (sakiCheck.dead) { //React to next message. sakiCheck.dead=false;