SBDevelopment/MapReflectionAPI
3
0
Fork 0
Code Issues 2 Pull requests 1 Activity Actions

Fixed getEntity() NMS exception, closes #2

Browse source
This commit is contained in:
SBDeveloper 2022-07-29 14:34:51 +02:00
parent 771a0210d9
commit 49e7fefe5f
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapWrapper.java
View file

@ -239,14 +239,17 @@ public class MapWrapper {
@Override @Override
public ItemFrame getItemFrameById(World world, int entityId) { public ItemFrame getItemFrameById(World world, int entityId) {
Object worldHandle = ReflectionUtil.getHandle(world); Object worldHandle = ReflectionUtil.getHandle(world);
Object nmsEntity = ReflectionUtil.callMethod(worldHandle, ReflectionUtil.supports(18) ? "a" : "getEntity"); Object nmsEntity = ReflectionUtil.callMethod(worldHandle, ReflectionUtil.supports(18) ? "a" : "getEntity", entityId);
if (nmsEntity == null) return null; if (nmsEntity == null) return null;
if (!ReflectionUtil.supports(17)) { Object craftEntity = ReflectionUtil.callMethod(nmsEntity, "getBukkitEntity");
nmsEntity = ReflectionUtil.callMethod(nmsEntity, "getBukkitEntity"); if (craftEntity == null) return null;
}
if (nmsEntity instanceof ItemFrame) return (ItemFrame) nmsEntity; Class<?> itemFrameClass = ReflectionUtil.getNMSClass("world.entity.decoration", "EntityItemFrame");
if (itemFrameClass == null) return null;
if (craftEntity.getClass().isAssignableFrom(itemFrameClass))
return (ItemFrame) itemFrameClass.cast(craftEntity);
return null; return null;
} }