From 519af589898843f9be97ec570738981757f108d5 Mon Sep 17 00:00:00 2001 From: Pingex Date: Tue, 30 Aug 2016 14:36:18 +0200 Subject: [PATCH] Forgot to also pass MRE into ICommandExecutor. --- src/main/java/net/pingex/dcf/commands/Command.java | 14 +++++++++++--- .../net/pingex/dcf/commands/ICommandExecutor.java | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/pingex/dcf/commands/Command.java b/src/main/java/net/pingex/dcf/commands/Command.java index 564b82a..602420a 100644 --- a/src/main/java/net/pingex/dcf/commands/Command.java +++ b/src/main/java/net/pingex/dcf/commands/Command.java @@ -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 arguments) throws Throwable + public void execute(MessageReceivedEvent event, List 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 arguments) throws Throwable + { + target.invoke(invokable, event, arguments); + } + }; } } diff --git a/src/main/java/net/pingex/dcf/commands/ICommandExecutor.java b/src/main/java/net/pingex/dcf/commands/ICommandExecutor.java index 667c6e2..b6127e9 100644 --- a/src/main/java/net/pingex/dcf/commands/ICommandExecutor.java +++ b/src/main/java/net/pingex/dcf/commands/ICommandExecutor.java @@ -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 arguments) throws Throwable; + void execute(MessageReceivedEvent event, List arguments) throws Throwable; }