mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
b16a74c694
* feat: remove some features(#724) * feat: remove some features(#724) * merge master * fix
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Thu, 20 Jul 2023 17:23:33 +0800
|
|
Subject: [PATCH] Avoid Class#isAssignableFrom call in ClassInstanceMultiMap
|
|
|
|
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
|
|
|
|
diff --git a/net/minecraft/util/ClassInstanceMultiMap.java b/net/minecraft/util/ClassInstanceMultiMap.java
|
|
index 2a708ae0d5bb209650b525e3c56051f8b5655074..7f4b29fad0d70f0480b8b13d7a7d8d7a7f90b491 100644
|
|
--- a/net/minecraft/util/ClassInstanceMultiMap.java
|
|
+++ b/net/minecraft/util/ClassInstanceMultiMap.java
|
|
@@ -56,13 +56,24 @@ public class ClassInstanceMultiMap<T> extends AbstractCollection<T> {
|
|
}
|
|
|
|
public <S> Collection<S> find(Class<S> type) {
|
|
- if (!this.baseClass.isAssignableFrom(type)) {
|
|
- throw new IllegalArgumentException("Don't know how to search for " + type);
|
|
- } else {
|
|
- List<? extends T> list = this.byClass
|
|
- .computeIfAbsent(type, clazz -> this.allInstances.stream().filter(clazz::isInstance).collect(Util.toMutableList()));
|
|
- return (Collection<S>)Collections.unmodifiableCollection(list);
|
|
+ // Leaves start - avoid Class#isAssignableFrom call in ClassInstanceMultiMap
|
|
+ Collection<T> collection = this.byClass.get(type);
|
|
+ if (collection == null) {
|
|
+ collection = this.createAllOfType(type);
|
|
}
|
|
+ return (Collection<S>) Collections.unmodifiableCollection(collection);
|
|
+ }
|
|
+
|
|
+ private <S> Collection<T> createAllOfType(Class<S> type) {
|
|
+ List<T> list = new java.util.ArrayList<>(1);
|
|
+ for (T allElement : this.allInstances) {
|
|
+ if (type.isInstance(allElement)) {
|
|
+ list.add(allElement);
|
|
+ }
|
|
+ }
|
|
+ this.byClass.put(type, list);
|
|
+ return list;
|
|
+ // Leaves end - avoid Class#isAssignableFrom call in ClassInstanceMultiMap
|
|
}
|
|
|
|
@Override
|