X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Freactor%2Fengine%2FEngine.java;h=4ba78877ac9a42ec8228f433a6e0372d0dee1b3c;hb=83b112233f6ff6b5f8f42b607857eac86a3addff;hp=41aedb70d6c3a0c5e7c712a6f002f75e722fe027;hpb=c4f2df9b1f0ac93cdd4a71735cba2bc5f295a6d7;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/reactor/engine/Engine.java b/src/main/java/net/pterodactylus/reactor/engine/Engine.java
index 41aedb7..4ba7887 100644
--- a/src/main/java/net/pterodactylus/reactor/engine/Engine.java
+++ b/src/main/java/net/pterodactylus/reactor/engine/Engine.java
@@ -27,6 +27,7 @@ import net.pterodactylus.reactor.Query;
 import net.pterodactylus.reactor.Reaction;
 import net.pterodactylus.reactor.Trigger;
 import net.pterodactylus.reactor.states.AbstractState;
+import net.pterodactylus.reactor.states.FailedState;
 
 import org.apache.log4j.Logger;
 
@@ -122,6 +123,9 @@ public class Engine extends AbstractExecutionThreadService {
 			try {
 				logger.debug("Querying system...");
 				state = query.state();
+				if (state == null) {
+					state = FailedState.INSTANCE;
+				}
 				logger.debug("System queried.");
 			} catch (Throwable t1) {
 				logger.warn("Querying system failed!", t1);
@@ -133,16 +137,20 @@ public class Engine extends AbstractExecutionThreadService {
 
 			/* 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;
+				if (state.success()) {
+					net.pterodactylus.reactor.State newState = filter.filter(state);
+					logger.debug(String.format("Old state is %s, new state is %s.", state, newState));
+					state = newState;
+				}
+			}
+			if (state.success()) {
+				reactionExecution.addState(state);
 			}
-			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();
+			if ((reactionExecution.previousState() != null) && state.success()) {
 				logger.debug("Checking Trigger for changes...");
 				triggerHit = trigger.triggers(reactionExecution.currentState(), reactionExecution.previousState());
 			}
@@ -151,8 +159,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());
 			}
+
 		}
 	}