From 2705eba5538499f0af59ddc4451e523f6d8ab145 Mon Sep 17 00:00:00 2001
From: Seppe Volkaerts <seppevolkaerts@hotmail.com>
Date: Tue, 15 Dec 2020 14:00:10 +0100
Subject: [PATCH] Small cleanup.

---
 .../main/java/com/velocitypowered/proxy/VelocityServer.java    | 3 +--
 .../com/velocitypowered/proxy/event/VelocityEventManager.java  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
index 1ae954ce3..444e695f9 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
@@ -27,12 +27,11 @@ import com.velocitypowered.proxy.command.builtin.VelocityCommand;
 import com.velocitypowered.proxy.config.VelocityConfiguration;
 import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
 import com.velocitypowered.proxy.console.VelocityConsole;
+import com.velocitypowered.proxy.event.VelocityEventManager;
 import com.velocitypowered.proxy.network.ConnectionManager;
 import com.velocitypowered.proxy.network.ProtocolUtils;
 import com.velocitypowered.proxy.network.serialization.FaviconSerializer;
 import com.velocitypowered.proxy.network.serialization.GameProfileSerializer;
-import com.velocitypowered.proxy.event.VelocityEventManager;
-import com.velocitypowered.proxy.network.ConnectionManager;
 import com.velocitypowered.proxy.plugin.VelocityPluginManager;
 import com.velocitypowered.proxy.scheduler.VelocityScheduler;
 import com.velocitypowered.proxy.server.ServerMap;
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 106e6b017..ee2069fd0 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
@@ -316,7 +316,7 @@ public class VelocityEventManager implements EventManager {
       }
       final UntargetedEventHandler untargetedHandler =
           untargetedMethodHandlers.get(info.method);
-      requireNonNull(untargetedHandler);
+      assert untargetedHandler != null;
       final EventHandler<Object> handler = event -> untargetedHandler.execute(listener, event);
       registrations.add(new HandlerRegistration(pluginContainer, info.order,
           info.eventType, listener, handler, info.asyncType));