greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Auto stash before merge of "hax-dev" and "origin/greg-dev"

Browse source
This commit is contained in:
Hax 2019-12-28 13:13:03 +01:00
parent 57b76642d1
commit c0d39f3624
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
View file

@ -45,6 +45,7 @@ public class EvalCommand implements Command {
engine.put("member", event.getMember());
engine.put("self", event.getGuild().getSelfMember());
engine.put("audio", new AudioManager());
engine.put("out", System.out);
ScheduledExecutorService service = Executors.newScheduledThreadPool(1);

3
src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
View file

@ -29,8 +29,11 @@ public class GuildLeaveCommand implements Command {
} catch (Exception e) {
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
}
<<<<<<< Updated upstream
} else {
event.getHelpCommand().sendHelp(this, event);
=======
>>>>>>> Stashed changes
}
}