Mirror von
https://github.com/PaperMC/Velocity.git
synchronisiert 2024-12-24 23:30:26 +01:00
Only unregister event handlers/listeners if the correct matching plugin is given
Currently, unregister will succeed & unregister a handler/listener if any valid plugin is given, not necessarily the one the handler was registered with.
Dieser Commit ist enthalten in:
Ursprung
21a79d8142
Commit
72c668c048
@ -161,16 +161,18 @@ public class VelocityEventManager implements EventManager {
|
|||||||
public void unregisterListener(Object plugin, Object listener) {
|
public void unregisterListener(Object plugin, Object listener) {
|
||||||
ensurePlugin(plugin);
|
ensurePlugin(plugin);
|
||||||
Preconditions.checkNotNull(listener, "listener");
|
Preconditions.checkNotNull(listener, "listener");
|
||||||
registeredListenersByPlugin.remove(plugin, listener);
|
if (registeredListenersByPlugin.remove(plugin, listener)) {
|
||||||
methodAdapter.unregister(listener);
|
methodAdapter.unregister(listener);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <E> void unregister(Object plugin, EventHandler<E> handler) {
|
public <E> void unregister(Object plugin, EventHandler<E> handler) {
|
||||||
ensurePlugin(plugin);
|
ensurePlugin(plugin);
|
||||||
Preconditions.checkNotNull(handler, "listener");
|
Preconditions.checkNotNull(handler, "listener");
|
||||||
registeredHandlersByPlugin.remove(plugin, handler);
|
if (registeredHandlersByPlugin.remove(plugin, handler)) {
|
||||||
unregisterHandler(handler);
|
unregisterHandler(handler);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean shutdown() throws InterruptedException {
|
public boolean shutdown() throws InterruptedException {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren