Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-28 07:24:57 +02:00
Code Issues Projects Releases Wiki Activity

Simplify EventNode#map

Browse Source
This commit is contained in:
TheMode 2021-06-03 05:59:13 +02:00
parent 8ec33bb6c8
commit e300d3ec57
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/minestom/server/event/EventNode.java
View File

@ -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;
}
}

2
src/test/java/demo/PlayerInit.java
View File

@ -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 -> {