diff --git a/src/main/java/net/minestom/server/entity/acquirable/AcquirableEntity.java b/src/main/java/net/minestom/server/entity/acquirable/AcquirableEntity.java index 07702d6e6..6ed00d659 100644 --- a/src/main/java/net/minestom/server/entity/acquirable/AcquirableEntity.java +++ b/src/main/java/net/minestom/server/entity/acquirable/AcquirableEntity.java @@ -61,7 +61,7 @@ public class AcquirableEntity { */ public void acquire(@NotNull EntityConsumer consumer) { final Thread currentThread = Thread.currentThread(); - final TickThread elementThread = getHandler().getBatchThread(); + final TickThread elementThread = getHandler().getTickThread(); Acquisition.acquire(currentThread, elementThread, () -> consumer.accept(unwrap())); } @@ -75,7 +75,7 @@ public class AcquirableEntity { */ public boolean tryAcquire(@NotNull EntityConsumer consumer) { final Thread currentThread = Thread.currentThread(); - final TickThread elementThread = getHandler().getBatchThread(); + final TickThread elementThread = getHandler().getTickThread(); if (Objects.equals(currentThread, elementThread)) { consumer.accept(unwrap()); return true; @@ -91,7 +91,7 @@ public class AcquirableEntity { */ public @Nullable Entity tryAcquire() { final Thread currentThread = Thread.currentThread(); - final TickThread elementThread = getHandler().getBatchThread(); + final TickThread elementThread = getHandler().getTickThread(); if (Objects.equals(currentThread, elementThread)) { return unwrap(); } @@ -143,7 +143,7 @@ public class AcquirableEntity { this.chunkEntry = chunkEntry; } - public TickThread getBatchThread() { + public TickThread getTickThread() { return chunkEntry != null ? chunkEntry.getThread() : null; } } diff --git a/src/main/java/net/minestom/server/entity/acquirable/Acquisition.java b/src/main/java/net/minestom/server/entity/acquirable/Acquisition.java index 8da1988f2..bc85b5eb5 100644 --- a/src/main/java/net/minestom/server/entity/acquirable/Acquisition.java +++ b/src/main/java/net/minestom/server/entity/acquirable/Acquisition.java @@ -155,7 +155,7 @@ public final class Acquisition { for (AcquirableEntity element : collection) { final Entity value = element.unwrap(); - final TickThread elementThread = element.getHandler().getBatchThread(); + final TickThread elementThread = element.getHandler().getTickThread(); if (currentThread == elementThread) { // The element is managed in the current thread, consumer can be immediately called consumer.accept(value); @@ -175,7 +175,7 @@ public final class Acquisition { Map> threadCacheMap = new HashMap<>(); for (AcquirableEntity acquirableEntity : collection) { final Entity entity = acquirableEntity.unwrap(); - final TickThread elementThread = acquirableEntity.getHandler().getBatchThread(); + final TickThread elementThread = acquirableEntity.getHandler().getTickThread(); List threadCacheList = threadCacheMap.computeIfAbsent(elementThread, tickThread -> new ArrayList<>()); threadCacheList.add(entity);