Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-19 06:32:03 +01:00
Code Issues Projects Releases Wiki Activity

Override AcquirableCollection#forEach

Browse Source
This commit is contained in:
TheMode 2021-04-15 10:06:34 +02:00
parent b5add32ad6
commit 2045ce5743
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minestom/server/lock/AcquirableCollection.java
View File

@ -17,7 +17,8 @@ public class AcquirableCollection<E extends LockedElement> extends CollectionVie
this.acquirableCollection = acquirableCollection;
}
public void forEachAcquire(@NotNull Consumer<@NotNull E> action) {
@Override
public void forEach(Consumer<? super E> action) {
Acquisition.acquireForEach(acquirableCollection, action);
}
}

14
src/main/java/net/minestom/server/lock/Acquisition.java
View File

@ -81,8 +81,8 @@ public final class Acquisition {
}
}
public static <E, T extends Acquirable<E>> void acquireForEach(@NotNull Collection<T> collection,
@NotNull Consumer<E> consumer) {
public static <E, T extends Acquirable<E>> void acquireForEach(@NotNull Collection<? super T> collection,
@NotNull Consumer<? super E> consumer) {
final Thread currentThread = Thread.currentThread();
Map<BatchThread, List<E>> threadCacheMap = retrieveThreadMap(collection, currentThread, consumer);
@ -221,6 +221,8 @@ public final class Acquisition {
periodQueue.wait();
}
acquiredThread.remove(elementThread);
if (monitoring) {
time = System.nanoTime() - time;
WAIT_COUNTER_NANO.addAndGet(time);
@ -241,12 +243,12 @@ public final class Acquisition {
.add((Consumer<Object>) consumer);
}
private static <E, T extends Acquirable<E>> Map<BatchThread, List<E>> retrieveThreadMap(@NotNull Collection<T> collection,
private static <E, T extends Acquirable<E>> Map<BatchThread, List<E>> retrieveThreadMap(@NotNull Collection<? super T> collection,
@NotNull Thread currentThread,
@NotNull Consumer<E> consumer) {
@NotNull Consumer<? super E> consumer) {
Map<BatchThread, List<E>> threadCacheMap = new HashMap<>();
for (T element : collection) {
for (Object obj : collection) {
T element = (T) obj;
final E value = element.unwrap();
final BatchThread elementThread = element.getHandler().getBatchThread();