mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2024-11-27 06:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

We don't need the sorted order that a List provides

Browse Source
This commit is contained in:
Andrew Steinborn 2021-07-19 13:33:03 -04:00
parent 349781cff8
commit 2f82603f65
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java
View File

@ -17,27 +17,28 @@
package com.velocitypowered.proxy.event;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
import com.google.common.reflect.TypeToken;
import java.util.List;
import java.util.Collection;
import java.util.stream.Collectors;
class EventTypeTracker {
private final ListMultimap<Class<?>, Class<?>> friends;
private final Multimap<Class<?>, Class<?>> friends;
public EventTypeTracker() {
this.friends = ArrayListMultimap.create();
this.friends = HashMultimap.create();
}
public List<Class<?>> getFriendsOf(final Class<?> eventType) {
public Collection<Class<?>> getFriendsOf(final Class<?> eventType) {
if (friends.containsKey(eventType)) {
return ImmutableList.copyOf(friends.get(eventType));
return ImmutableSet.copyOf(friends.get(eventType));
}
final List<Class<?>> types = getEventTypes(eventType);
final Collection<Class<?>> types = getEventTypes(eventType);
for (Class<?> type : types) {
if (type == eventType) {
continue;
@ -48,7 +49,7 @@ class EventTypeTracker {
return types;
}
private static List<Class<?>> getEventTypes(final Class<?> eventType) {
private static Collection<Class<?>> getEventTypes(final Class<?> eventType) {
return TypeToken.of(eventType).getTypes().rawTypes().stream()
.filter(type -> type != Object.class)
.collect(Collectors.toList());

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

@ -46,6 +46,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@ -175,7 +176,7 @@ public class VelocityEventManager implements EventManager {
private @Nullable HandlersCache bakeHandlers(final Class<?> eventType) {
final List<HandlerRegistration> baked = new ArrayList<>();
final List<Class<?>> types = eventTypeTracker.getFriendsOf(eventType);
final Collection<Class<?>> types = eventTypeTracker.getFriendsOf(eventType);
lock.readLock().lock();
try {