From 8495659364e188a0d8c8a874c30a44cea70ba50b Mon Sep 17 00:00:00 2001 From: tueem Date: Sat, 29 Mar 2025 18:37:51 +0100 Subject: [PATCH] fix(registry): fix logic error in InteractionEntry identifier checking and fix InteractionIdentifier#equals to actually recursively check parent identifiers --- .../marinara/interaction/ident/InteractionIdentifier.java | 2 +- .../java/net/tomatentum/marinara/registry/InteractionEntry.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/main/java/net/tomatentum/marinara/interaction/ident/InteractionIdentifier.java b/lib/src/main/java/net/tomatentum/marinara/interaction/ident/InteractionIdentifier.java index 7207738..9ef1298 100644 --- a/lib/src/main/java/net/tomatentum/marinara/interaction/ident/InteractionIdentifier.java +++ b/lib/src/main/java/net/tomatentum/marinara/interaction/ident/InteractionIdentifier.java @@ -80,7 +80,7 @@ public class InteractionIdentifier { return false; if (!name().equals(ident.name())) return false; - return Objects.equals(ident, obj); + return Objects.equals(parent(), ident.parent()); } @Override diff --git a/lib/src/main/java/net/tomatentum/marinara/registry/InteractionEntry.java b/lib/src/main/java/net/tomatentum/marinara/registry/InteractionEntry.java index d0e56db..310aa8b 100644 --- a/lib/src/main/java/net/tomatentum/marinara/registry/InteractionEntry.java +++ b/lib/src/main/java/net/tomatentum/marinara/registry/InteractionEntry.java @@ -36,7 +36,7 @@ public class InteractionEntry { public InteractionEntry addMethod(InteractionMethod method) { InteractionIdentifier identifier = method.identifier(); - if (this.identifier().equals(identifier)) + if (!this.identifier().equals(identifier)) throw new IllegalArgumentException("Method's identifier did not equal the entry's identifier"); this.methods.add(method);