Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-30 14:43:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dmulloy2:master' into Add-protocol-version-for-1.20.1

Browse Source
This commit is contained in:
Noltox 2023-07-03 19:45:04 +02:00 committed by GitHub
commit 928adfa866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
import com.comphenix.protocol.utility.MinecraftFields; import com.comphenix.protocol.utility.MinecraftFields;
import com.comphenix.protocol.utility.MinecraftReflection; import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.utility.MinecraftVersion; import com.comphenix.protocol.utility.MinecraftVersion;
import com.comphenix.protocol.utility.Util;
import com.comphenix.protocol.wrappers.WrappedIntHashMap; import com.comphenix.protocol.wrappers.WrappedIntHashMap;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -34,7 +35,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
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;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -61,6 +61,7 @@ class EntityUtilities {
private FieldAccessor entityTrackerField; private FieldAccessor entityTrackerField;
private FieldAccessor trackedPlayersField; private FieldAccessor trackedPlayersField;
private FieldAccessor trackedEntitiesField; private FieldAccessor trackedEntitiesField;
private FieldAccessor foliaTrackerField;
private MethodAccessor getEntity; private MethodAccessor getEntity;
private MethodAccessor getChunkProvider; private MethodAccessor getChunkProvider;
@ -203,6 +204,25 @@ class EntityUtilities {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Object getNewEntityTracker(Object worldServer, int entityId) { private Object getNewEntityTracker(Object worldServer, int entityId) {
if (Util.isUsingFolia()) {
if (this.getEntity == null) {
Method entityGetter = FuzzyReflection.fromObject(worldServer).getMethodByReturnTypeAndParameters(
"getEntity",
MinecraftReflection.getEntityClass(),
int.class);
this.getEntity = Accessors.getMethodAccessor(entityGetter);
}
Object entity = this.getEntity.invoke(worldServer, entityId);
if (this.foliaTrackerField == null) {
this.foliaTrackerField = Accessors.getFieldAccessor(FuzzyReflection.fromClass(entity.getClass(), false)
.getField(FuzzyFieldContract.newBuilder().typeExact(MinecraftReflection.getEntityTrackerClass()).build()));
}
return this.foliaTrackerField.get(entity);
}
if (this.getChunkProvider == null) { if (this.getChunkProvider == null) {
Class<?> chunkProviderClass = MinecraftReflection.getChunkProviderServer(); Class<?> chunkProviderClass = MinecraftReflection.getChunkProviderServer();
this.getChunkProvider = Accessors.getMethodAccessor(FuzzyReflection.fromClass(worldServer.getClass(), false) this.getChunkProvider = Accessors.getMethodAccessor(FuzzyReflection.fromClass(worldServer.getClass(), false)