ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

eventbus: preserve priority ordering during unregister

Browse Source
This commit is contained in:
Max Weber
2021-03-26 22:29:10 -06:00
committed by Adam
parent 988f90df05
commit 38fbcb39d6
1 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java
View File

@@ -26,9 +26,8 @@
package net.runelite.client.eventbus; package net.runelite.client.eventbus;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Iterables;
import java.lang.invoke.CallSite; import java.lang.invoke.CallSite;
import java.lang.invoke.LambdaMetafactory; import java.lang.invoke.LambdaMetafactory;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
@@ -186,26 +185,10 @@ public class EventBus
*/ */
public synchronized void unregister(@Nonnull final Object object) public synchronized void unregister(@Nonnull final Object object)
{ {
final Multimap<Class<?>, Subscriber> map = HashMultimap.create(); subscribers = ImmutableMultimap.copyOf(Iterables.filter(
map.putAll(subscribers); subscribers.entries(),
e -> e.getValue().getObject() != object
for (Class<?> clazz = object.getClass(); clazz != null; clazz = clazz.getSuperclass()) ));
{
for (final Method method : clazz.getDeclaredMethods())
{
final Subscribe sub = method.getAnnotation(Subscribe.class);
if (sub == null)
{
continue;
}
final Class<?> parameterClazz = method.getParameterTypes()[0];
map.remove(parameterClazz, new Subscriber(object, method, sub.priority(), null));
}
}
subscribers = ImmutableMultimap.copyOf(map);
} }
public synchronized void unregister(Subscriber sub) public synchronized void unregister(Subscriber sub)
@@ -215,12 +198,10 @@ public class EventBus
return; return;
} }
final Multimap<Class<?>, Subscriber> map = HashMultimap.create(); subscribers = ImmutableMultimap.copyOf(Iterables.filter(
map.putAll(subscribers); subscribers.entries(),
e -> sub != e.getValue()
map.values().remove(sub); ));
subscribers = ImmutableMultimap.copyOf(map);
} }
/** /**