From d4a91f3251e1de4ed67ba91f9cdf8b02a1ea774e Mon Sep 17 00:00:00 2001
From: Tueem <tueem@tomatentum.net>
Date: Mon, 17 Mar 2025 00:15:10 +0100
Subject: [PATCH] fix(core): fix wrong equality method and refactor a bit

---
 .../marinara/registry/InteractionRegistry.java        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java b/lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java
index a708c71..6314b88 100644
--- a/lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java
+++ b/lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java
@@ -40,11 +40,12 @@ public class InteractionRegistry {
         for (Method method : interactionHandler.getClass().getMethods()) {
             InteractionMethod iMethod = InteractionMethod.create(method, interactionHandler, marinara);
             if (iMethod != null) {
-                Optional<InteractionEntry> entry = this.interactions.stream().filter(iMethod::equals).findFirst();
-                if (entry.isEmpty()) {
-                    interactions.add(new InteractionEntry(iMethod.identifier()).addMethod(iMethod));
-                }else
-                    entry.get().addMethod(iMethod);
+                Optional<InteractionEntry> oentry = this.interactions.stream()
+                    .filter(i -> i.identifier().equals(iMethod.identifier()))
+                    .findFirst();
+
+                InteractionEntry entry = oentry.orElse(new InteractionEntry(iMethod.identifier())).addMethod(iMethod);
+                if (oentry.isEmpty()) this.interactions.add(entry);
                 logger.debug("Added {} method from {}", iMethod.method().getName(), interactionHandler.getClass().getSimpleName());
             }
         }