X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Floader%2FReactionLoader.java;h=94009af6f5a943da70435573f251c7e82a7127f2;hb=00e49489dcbb093895a9a7bfb252b7392b341138;hp=10608d942c204afc12d92e64074974c818d08bcd;hpb=b304bea61c03505fea7c288164ead3233ef36655;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/rhynodge/loader/ReactionLoader.java b/src/main/java/net/pterodactylus/rhynodge/loader/ReactionLoader.java
index 10608d9..94009af 100644
--- a/src/main/java/net/pterodactylus/rhynodge/loader/ReactionLoader.java
+++ b/src/main/java/net/pterodactylus/rhynodge/loader/ReactionLoader.java
@@ -27,10 +27,10 @@ import net.pterodactylus.rhynodge.Action;
 import net.pterodactylus.rhynodge.Filter;
 import net.pterodactylus.rhynodge.Query;
 import net.pterodactylus.rhynodge.Reaction;
-import net.pterodactylus.rhynodge.Trigger;
 import net.pterodactylus.rhynodge.Watcher;
 import net.pterodactylus.rhynodge.loader.Chain.Parameter;
 import net.pterodactylus.rhynodge.loader.Chain.Part;
+import net.pterodactylus.rhynodge.Merger;
 
 /**
  * Creates {@link Reaction}s from {@link Chain}s.
@@ -68,7 +68,7 @@ public class ReactionLoader {
 			Watcher watcher = createObject(chain.watcher().name(), "net.pterodactylus.rhynodge.watchers", extractParameters(chain.watcher().parameters()));
 
 			/* create reaction. */
-			reaction = new Reaction(chain.name(), watcher.query(), watcher.filters(), watcher.trigger(), action);
+			reaction = new Reaction(chain.name(), watcher.query(), watcher.filters(), watcher.merger(), action);
 
 		} else {
 
@@ -81,11 +81,11 @@ public class ReactionLoader {
 				filters.add(ReactionLoader.<Filter> createObject(filterPart.name(), "net.pterodactylus.rhynodge.filters", extractParameters(filterPart.parameters())));
 			}
 
-			/* create trigger. */
-			Trigger trigger = createObject(chain.trigger().name(), "net.pterodactylus.rhynodge.triggers", extractParameters(chain.trigger().parameters()));
+			/* create merger. */
+			Merger merger = createObject(chain.merger().name(), "net.pterodactylus.rhynodge.mergers", extractParameters(chain.merger().parameters()));
 
 			/* create reaction. */
-			reaction = new Reaction(chain.name(), query, filters, trigger, action);
+			reaction = new Reaction(chain.name(), query, filters, merger, action);
 		}
 
 		reaction.setUpdateInterval(TimeUnit.SECONDS.toMillis(chain.updateInterval()));