🐛 Fix broken change detection

[rhynodge.git] / src / main / java / net / pterodactylus / rhynodge / loader / Chain.java

diff --git a/src/main/java/net/pterodactylus/rhynodge/loader/Chain.java b/src/main/java/net/pterodactylus/rhynodge/loader/Chain.java
index d54fae0..c4eba26 100644 (file)
--- a/src/main/java/net/pterodactylus/rhynodge/loader/Chain.java
+++ b/src/main/java/net/pterodactylus/rhynodge/loader/Chain.java
@@ -85,10 +85,7 @@ public class Chain {
                        if (!name.equals(parameter.name)) {
                                return false;
                        }
-                       if (!value.equals(parameter.value)) {
-                               return false;
-                       }
-                       return true;
+                       return value.equals(parameter.value);
                }
 
        }
@@ -180,11 +177,11 @@ public class Chain {
        @JsonProperty
        private List<Part> filters = new ArrayList<Part>();
 
-       /** The trigger of the chain. */
+       /** The merger of the chain. */
        @JsonProperty
-       private Part trigger;
+       private Part merger;
 
-       /** A combination of query, filters, and a trigger. */
+       /** A combination of query, filters, and a merger. */
        @JsonProperty
        private Part watcher;
 
@@ -233,12 +230,12 @@ public class Chain {
        }
 
        /**
-        * Returns the trigger of this chain.
+        * Returns the merger of this chain.
         *
-        * @return The trigger of this chain
+        * @return The merger of this chain
         */
-       public Part trigger() {
-               return trigger;
+       public Part merger() {
+               return merger;
        }
 
        /**
@@ -286,7 +283,7 @@ public class Chain {
                        for (Part filter : filters) {
                                hashCode ^= filter.hashCode();
                        }
-                       hashCode ^= trigger.hashCode();
+                       hashCode ^= merger.hashCode();
                }
                hashCode ^= action.hashCode();
                hashCode ^= updateInterval;
@@ -321,17 +318,14 @@ public class Chain {
                                        return false;
                                }
                        }
-                       if (!trigger.equals(chain.trigger)) {
+                       if (!merger.equals(chain.merger)) {
                                return false;
                        }
                }
                if (!action.equals(chain.action)) {
                        return false;
                }
-               if (updateInterval != chain.updateInterval) {
-                       return false;
-               }
-               return true;
+               return updateInterval == chain.updateInterval;
        }
 
 }