X-Git-Url: https://git.pterodactylus.net/?p=rhynodge.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Ftriggers%2FAlwaysTrigger.java;h=5def993b12b41f654a72bdd6fa0a1b27d98538db;hp=3716894673b2c0b8ebf6bb8a60dcc5af60d11041;hb=9c01d55d3969a1b3df6529df0c64d4feb146fe4d;hpb=9871b8a902d59f6e8eade050d18c77026b6ecc60

diff --git a/src/main/java/net/pterodactylus/rhynodge/triggers/AlwaysTrigger.java b/src/main/java/net/pterodactylus/rhynodge/triggers/AlwaysTrigger.java
index 3716894..5def993 100644
--- a/src/main/java/net/pterodactylus/rhynodge/triggers/AlwaysTrigger.java
+++ b/src/main/java/net/pterodactylus/rhynodge/triggers/AlwaysTrigger.java
@@ -32,9 +32,21 @@ public class AlwaysTrigger implements Trigger {
 
 	/**
 	 * {@inheritDoc}
+	 * <p>
+	 * This implementation returns the current state.
 	 */
 	@Override
-	public boolean triggers(State currentState, State previousState) {
+	public State mergeStates(State previousState, State currentState) {
+		return currentState;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * This implementation always returns {@code true}.
+	 */
+	@Override
+	public boolean triggers() {
 		return true;
 	}