MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Warn if someone tries to register the plugin instance as a listener

Browse Source
This commit is contained in:
Andrew Steinborn
2018-09-29 03:15:49 -04:00
parent 79d566bcee
commit 97d541d146
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/src/main/java/com/velocitypowered/proxy/plugin/VelocityEventManager.java
View File

@@ -58,6 +58,9 @@ public class VelocityEventManager implements EventManager {
Preconditions.checkNotNull(plugin, "plugin"); Preconditions.checkNotNull(plugin, "plugin");
Preconditions.checkNotNull(listener, "listener"); Preconditions.checkNotNull(listener, "listener");
Preconditions.checkArgument(pluginManager.fromInstance(plugin).isPresent(), "Specified plugin is not loaded"); Preconditions.checkArgument(pluginManager.fromInstance(plugin).isPresent(), "Specified plugin is not loaded");
if (plugin == listener && registeredListenersByPlugin.containsEntry(plugin, plugin)) {
throw new IllegalArgumentException("Trying to register the plugin main instance. Velocity already takes care of this for you.");
}
registeredListenersByPlugin.put(plugin, listener); registeredListenersByPlugin.put(plugin, listener);
bus.register(listener); bus.register(listener);
} }