Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary list check

Browse Source
This commit is contained in:
TheMode 2021-08-17 01:35:16 +02:00
parent e1c1f1d545
commit d5cdb36e47
2 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minestom/server/event/EventInterface.java
View File

@ -48,7 +48,6 @@ public interface EventInterface<E extends Event> {
final T handler = filter.getHandler(event); final T handler = filter.getHandler(event);
if (!predicate.test(handler)) return; if (!predicate.test(handler)) return;
final var consumer = copy.get(event.getClass()); final var consumer = copy.get(event.getClass());
if (consumer == null) return;
consumer.accept(handler, event); consumer.accept(handler, event);
} }
}; };

79
src/main/java/net/minestom/server/event/EventNodeImpl.java
View File

@ -57,46 +57,7 @@ class EventNodeImpl<T extends Event> implements EventNode<T> {
// Process listeners list // Process listeners list
final var entry = listenerMap.get(eventClass); final var entry = listenerMap.get(eventClass);
if (entry == null) return; // No listener nor children if (entry == null) return; // No listener nor children
{ entry.call(event);
// Event interfaces
final var interfaces = entry.interfaces;
if (!interfaces.isEmpty()) {
for (EventInterface<T> inter : interfaces) {
if (!inter.eventTypes().contains(eventClass)) continue;
inter.call(event);
}
}
// Mapped listeners
final var mapped = entry.mappedNode;
if (!mapped.isEmpty()) {
synchronized (mappedNodeCache) {
if (!mapped.isEmpty()) {
// Check mapped listeners for each individual event handler
for (var filter : entry.filters) {
final var handler = filter.castHandler(event);
final var map = mapped.get(handler);
if (map != null) map.call(event);
}
}
}
}
// Basic listeners
final var listeners = entry.listeners;
if (!listeners.isEmpty()) {
for (EventListener<T> listener : listeners) {
EventListener.Result result;
try {
result = listener.run(event);
} catch (Exception e) {
result = EventListener.Result.EXCEPTION;
MinecraftServer.getExceptionManager().handleException(e);
}
if (result == EventListener.Result.EXPIRED) {
listeners.remove(listener);
}
}
}
}
// Process children // Process children
if (entry.childCount > 0) { if (entry.childCount > 0) {
this.children.stream() this.children.stream()
@ -241,7 +202,8 @@ class EventNodeImpl<T extends Event> implements EventNode<T> {
}); });
Check.stateCondition(!correct, "The node filter {0} is not compatible with type {1}", nodeType, valueType); Check.stateCondition(!correct, "The node filter {0} is not compatible with type {1}", nodeType, valueType);
synchronized (mappedNodeCache) { synchronized (mappedNodeCache) {
entry.mappedNode.put(value, (EventNode<T>) node); System.out.println("add " + value + " " + nodeImpl + " " + type);
entry.mappedNode.put(value, (EventNode<T>) nodeImpl);
mappedNodeCache.put(value, entry); mappedNodeCache.put(value, entry);
} }
}); });
@ -297,7 +259,7 @@ class EventNodeImpl<T extends Event> implements EventNode<T> {
private void propagateChildCountChange(Class<? extends T> eventClass, int count) { private void propagateChildCountChange(Class<? extends T> eventClass, int count) {
var entry = getEntry(eventClass); var entry = getEntry(eventClass);
final int result = ListenerEntry.addAndGet(entry, count); final int result = ListenerEntry.CHILD_UPDATER.addAndGet(entry, count);
if (result == 0 && entry.listeners.isEmpty()) { if (result == 0 && entry.listeners.isEmpty()) {
this.listenerMap.remove(eventClass); this.listenerMap.remove(eventClass);
} else if (result < 0) { } else if (result < 0) {
@ -349,8 +311,37 @@ class EventNodeImpl<T extends Event> implements EventNode<T> {
this.filters = FILTERS.stream().filter(eventFilter -> eventFilter.eventType().isAssignableFrom(eventType)).collect(Collectors.toList()); this.filters = FILTERS.stream().filter(eventFilter -> eventFilter.eventType().isAssignableFrom(eventType)).collect(Collectors.toList());
} }
private static int addAndGet(ListenerEntry<?> entry, int add) { void call(T event) {
return CHILD_UPDATER.addAndGet(entry, add); // Event interfaces
if (!interfaces.isEmpty()) {
for (EventInterface<T> inter : interfaces) {
inter.call(event);
}
}
// Mapped listeners
if (!mappedNode.isEmpty()) {
// Check mapped listeners for each individual event handler
for (var filter : filters) {
final var handler = filter.castHandler(event);
final var map = mappedNode.get(handler);
if (map != null) map.call(event);
}
}
// Basic listeners
if (!listeners.isEmpty()) {
for (EventListener<T> listener : listeners) {
EventListener.Result result;
try {
result = listener.run(event);
} catch (Exception e) {
result = EventListener.Result.EXCEPTION;
MinecraftServer.getExceptionManager().handleException(e);
}
if (result == EventListener.Result.EXPIRED) {
listeners.remove(listener);
}
}
}
} }
} }
} }