From e300d3ec57c07382c2efee0d675d502288480c40 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Thu, 3 Jun 2021 05:59:13 +0200
Subject: [PATCH] Simplify EventNode#map

---
 .../net/minestom/server/event/EventNode.java  | 20 ++++++-------------
 src/test/java/demo/PlayerInit.java            |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/net/minestom/server/event/EventNode.java b/src/main/java/net/minestom/server/event/EventNode.java
index 2976f1e15..b27ff1ac1 100644
--- a/src/main/java/net/minestom/server/event/EventNode.java
+++ b/src/main/java/net/minestom/server/event/EventNode.java
@@ -40,7 +40,7 @@ public class EventNode<T extends Event> {
     }
 
     private final Map<Class<? extends T>, List<EventListener<T>>> listenerMap = new ConcurrentHashMap<>();
-    private final Map<Object, RedirectionEntry<T>> redirectionMap = new ConcurrentHashMap<>();
+    private final Map<Object, EventNode<T>> redirectionMap = new ConcurrentHashMap<>();
     private final Set<EventNode<T>> children = new CopyOnWriteArraySet<>();
 
     protected final EventFilter<T, ?> filter;
@@ -82,9 +82,9 @@ public class EventNode<T extends Event> {
         // Process redirection
         final Object handler = filter.getHandler(event);
         if (handler != null) {
-            final var entry = redirectionMap.get(handler);
-            if (entry != null) {
-                entry.node.call(event);
+            final var node = redirectionMap.get(handler);
+            if (node != null) {
+                node.call(event);
             }
         }
         // Process listener list
@@ -172,11 +172,8 @@ public class EventNode<T extends Event> {
         return this;
     }
 
-    public <E extends T, V2> EventNode<T> map(@NotNull EventFilter<E, V2> filter, @NotNull V2 value, @NotNull EventNode<E> node) {
-        RedirectionEntry<E> entry = new RedirectionEntry<>();
-        entry.filter = filter;
-        entry.node = node;
-        this.redirectionMap.put(value, (RedirectionEntry<T>) entry);
+    public <E extends T> EventNode<T> map(@NotNull Object value, @NotNull EventNode<E> node) {
+        this.redirectionMap.put(value, (EventNode<T>) node);
         return this;
     }
 
@@ -215,9 +212,4 @@ public class EventNode<T extends Event> {
             throw new IllegalStateException("Something wrong happened, listener count: " + result);
         }
     }
-
-    private static class RedirectionEntry<E extends Event> {
-        EventFilter<E, ?> filter;
-        EventNode<E> node;
-    }
 }
diff --git a/src/test/java/demo/PlayerInit.java b/src/test/java/demo/PlayerInit.java
index 50000bcb0..9c30ecd29 100644
--- a/src/test/java/demo/PlayerInit.java
+++ b/src/test/java/demo/PlayerInit.java
@@ -175,7 +175,7 @@ public class PlayerInit {
             var test = EventNode.type(EventFilter.ENTITY);
             test.addListener(EventListener.of(PlayerMoveEvent.class, (e) ->
                     System.out.println("Test movement")));
-            empty.map(EventFilter.ENTITY, source, test);
+            empty.map(source, test);
         });
 
         globalEventHandler.addEventCallback(PlayerDeathEvent.class, event -> {