Make the object that trigger an action available.

[rhynodge.git] / src / main / java / net / pterodactylus / reactor / engine / Engine.java

diff --git a/src/main/java/net/pterodactylus/reactor/engine/Engine.java b/src/main/java/net/pterodactylus/reactor/engine/Engine.java
index 123781f..a8c9f4e 100644 (file)
--- a/src/main/java/net/pterodactylus/reactor/engine/Engine.java
+++ b/src/main/java/net/pterodactylus/reactor/engine/Engine.java
@@ -22,6 +22,7 @@ import java.util.Set;
 import java.util.SortedMap;
 import java.util.concurrent.TimeUnit;
 
+import net.pterodactylus.reactor.Filter;
 import net.pterodactylus.reactor.Query;
 import net.pterodactylus.reactor.Reaction;
 import net.pterodactylus.reactor.Trigger;
@@ -129,12 +130,19 @@ public class Engine extends AbstractExecutionThreadService {
                                };
                        }
                        logger.debug(String.format("State is %s.", state));
+
+                       /* convert states. */
+                       for (Filter filter : nextReaction.filters()) {
+                               net.pterodactylus.reactor.State newState = filter.filter(state);
+                               logger.debug(String.format("Old state is %s, new state is %s.", state, newState));
+                               state = newState;
+                       }
                        reactionExecution.addState(state);
 
                        /* only run trigger if we have collected two states. */
+                       Trigger trigger = nextReaction.trigger();
                        boolean triggerHit = false;
                        if (reactionExecution.previousState() != null) {
-                               Trigger trigger = nextReaction.trigger();
                                logger.debug("Checking Trigger for changes...");
                                triggerHit = trigger.triggers(reactionExecution.currentState(), reactionExecution.previousState());
                        }
@@ -143,8 +151,9 @@ public class Engine extends AbstractExecutionThreadService {
                        logger.debug(String.format("Trigger was hit: %s.", triggerHit));
                        if (triggerHit) {
                                logger.info("Executing Action...");
-                               nextReaction.action().execute(reactionExecution.currentState(), reactionExecution.previousState());
+                               nextReaction.action().execute(trigger.trigger());
                        }
+
                }
        }