Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-24 03:25:29 +01:00
Code Issues Projects Releases Wiki Activity

Support multiple EntityTrackerEntryImpls, fixes #732 (#733)

Browse Source
This commit is contained in:
MiniDigger 2019-12-16 18:32:26 +01:00 committed by Dan Mulloy
parent 3ff2ccf1b3
commit 524fb1ba68
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/comphenix/protocol/injector/EntityUtilities.java
View File

@ -19,6 +19,7 @@ package com.comphenix.protocol.injector;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -59,7 +60,7 @@ class EntityUtilities {
private FieldAccessor trackedPlayersField; private FieldAccessor trackedPlayersField;
private FieldAccessor trackerField; private FieldAccessor trackerField;
private MethodAccessor scanPlayersMethod; private Map<Class<?>, MethodAccessor> scanPlayersMethods = new HashMap<>();
public void updateEntity(Entity entity, List<Player> observers) { public void updateEntity(Entity entity, List<Player> observers) {
if (entity == null || !entity.isValid()) { if (entity == null || !entity.isValid()) {
@ -73,11 +74,8 @@ class EntityUtilities {
Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId()); Object trackerEntry = getEntityTrackerEntry(entity.getWorld(), entity.getEntityId());
if (scanPlayersMethod == null) { // there can be multiple different entity tracker entry impls, see GH-732....
scanPlayersMethod = findScanPlayers(trackerEntry.getClass()); scanPlayersMethods.computeIfAbsent(trackerEntry.getClass(), this::findScanPlayers).invoke(trackerEntry, nmsPlayers);
}
scanPlayersMethod.invoke(trackerEntry, nmsPlayers);
} }
private MethodAccessor findScanPlayers(Class<?> trackerClass) { private MethodAccessor findScanPlayers(Class<?> trackerClass) {