projects
/
rhynodge.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🐛 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
ab81754
..
c4eba26
100644
(file)
--- a/
src/main/java/net/pterodactylus/rhynodge/loader/Chain.java
+++ b/
src/main/java/net/pterodactylus/rhynodge/loader/Chain.java
@@
-177,11
+177,11
@@
public class Chain {
@JsonProperty
private List<Part> filters = new ArrayList<Part>();
@JsonProperty
private List<Part> filters = new ArrayList<Part>();
- /** The
trig
ger of the chain. */
+ /** The
mer
ger of the chain. */
@JsonProperty
@JsonProperty
- private Part
trig
ger;
+ private Part
mer
ger;
- /** A combination of query, filters, and a
trig
ger. */
+ /** A combination of query, filters, and a
mer
ger. */
@JsonProperty
private Part watcher;
@JsonProperty
private Part watcher;
@@
-230,12
+230,12
@@
public class Chain {
}
/**
}
/**
- * Returns the
trig
ger of this chain.
+ * Returns the
mer
ger of this chain.
*
*
- * @return The
trig
ger of this chain
+ * @return The
mer
ger of this chain
*/
*/
- public Part
trig
ger() {
- return
trig
ger;
+ public Part
mer
ger() {
+ return
mer
ger;
}
/**
}
/**
@@
-283,7
+283,7
@@
public class Chain {
for (Part filter : filters) {
hashCode ^= filter.hashCode();
}
for (Part filter : filters) {
hashCode ^= filter.hashCode();
}
- hashCode ^=
trig
ger.hashCode();
+ hashCode ^=
mer
ger.hashCode();
}
hashCode ^= action.hashCode();
hashCode ^= updateInterval;
}
hashCode ^= action.hashCode();
hashCode ^= updateInterval;
@@
-318,7
+318,7
@@
public class Chain {
return false;
}
}
return false;
}
}
- if (!
trigger.equals(chain.trig
ger)) {
+ if (!
merger.equals(chain.mer
ger)) {
return false;
}
}
return false;
}
}