pingex
/
dcf
Archived
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Forgot to also pass MRE into ICommandExecutor.

Browse Source
keep-around/d31701866686f66088b78de2e29736ae36e55a68
Pingex aka Raphaël 9 years ago
parent f5fbd49b12
commit 519af58989
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/net/pingex/dcf/commands/Command.java
Unescape Escape View File

@ -1,5 +1,6 @@
package net.pingex.dcf.commands;
import sx.blah.discord.handle.impl.events.MessageReceivedEvent;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collections;
@ -142,9 +143,9 @@ public abstract class Command implements ICommandExecutor
return new Command(name, aliases, description, isEnabled, usage)
{
@Override
public void execute(List<String> arguments) throws Throwable
public void execute(MessageReceivedEvent event, List<String> arguments) throws Throwable
{
toExecute.execute(arguments);
toExecute.execute(event, arguments);
}
};
}
@ -157,7 +158,14 @@ public abstract class Command implements ICommandExecutor
*/
public Command build(Method target, Object invokable)
{
return build(arguments -> target.invoke(invokable));
return new Command(name, aliases, description, isEnabled, usage)
{
@Override
public void execute(MessageReceivedEvent event, List<String> arguments) throws Throwable
{
target.invoke(invokable, event, arguments);
}
};
}
}

3
src/main/java/net/pingex/dcf/commands/ICommandExecutor.java
Unescape Escape View File

@ -1,5 +1,6 @@
package net.pingex.dcf.commands;
import sx.blah.discord.handle.impl.events.MessageReceivedEvent;
import java.util.List;
/**
@ -8,5 +9,5 @@ import java.util.List;
@FunctionalInterface
public interface ICommandExecutor
{
void execute(List<String> arguments) throws Throwable;
void execute(MessageReceivedEvent event, List<String> arguments) throws Throwable;
}