From ffa78d2a92a06b44b06652bd03af0c4a62ea52a6 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sun, 15 Sep 2024 17:00:15 -0400 Subject: [PATCH] Small clean-ups in event manager. --- .../velocitypowered/proxy/event/EventTypeTracker.java | 5 +++-- .../proxy/event/VelocityEventManager.java | 11 ----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java b/proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java index 808e79b92..f96de135c 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java @@ -33,8 +33,9 @@ class EventTypeTracker { } public Collection> getFriendsOf(final Class eventType) { - if (friends.containsKey(eventType)) { - return friends.get(eventType); + ImmutableSet> existingFriends = friends.get(eventType); + if (existingFriends != null) { + return existingFriends; } final Collection> types = getEventTypes(eventType); diff --git a/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java b/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java index ae0295653..f00c3877c 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java @@ -156,17 +156,6 @@ public class VelocityEventManager implements EventManager { } } - enum AsyncType { - /** - * The complete event will be handled on an async thread. - */ - ALWAYS, - /** - * The event will never run async, everything is handled on the netty thread. - */ - NEVER - } - static final class HandlersCache { final HandlerRegistration[] handlers;