sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Correct null pointer close #25

Browse Source
This commit is contained in:
BrokenFire 2018-02-27 16:52:23 +01:00
parent 5f5fc3ab16
commit 4bf0585fca
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/Broken/Commands/DayTrigger.java
View File

@ -26,7 +26,9 @@ public class DayTrigger implements Commande{
@Override @Override
public void action(String[] args, MessageReceivedEvent event) { public void action(String[] args, MessageReceivedEvent event) {
if(!event.isFromType(ChannelType.PRIVATE))
event.getMessage().delete().queue(); event.getMessage().delete().queue();
DayListener.getInstance().trigger();
} }

9
src/main/java/net/Broken/MainBot.java
View File

@ -101,7 +101,14 @@ public class MainBot {
if (commandes.containsKey(cmd.commande)) if (commandes.containsKey(cmd.commande))
{ {
Commande cmdObj = commandes.get(cmd.commande); Commande cmdObj = commandes.get(cmd.commande);
if(!cmdObj.isAdminCmd() || cmd.event.getMember().hasPermission(Permission.ADMINISTRATOR)){ boolean isAdmin;
if(cmd.event.isFromType(ChannelType.PRIVATE)){
isAdmin = jda.getGuilds().get(0).getMember(cmd.event.getAuthor()).hasPermission(Permission.ADMINISTRATOR);
}
else
isAdmin = cmd.event.getMember().hasPermission(Permission.ADMINISTRATOR);
if(!cmdObj.isAdminCmd() || isAdmin){
if(cmd.event.isFromType(ChannelType.PRIVATE) && commandes.get(cmd.commande).isPrivateUsable()) if(cmd.event.isFromType(ChannelType.PRIVATE) && commandes.get(cmd.commande).isPrivateUsable())
{ {