From 5f43578869349b948097821b683a58292f89d4cd Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 26 Oct 2022 21:57:39 +0200 Subject: [PATCH] Fix NoSuchFieldError on Paper-Spigot 1.19.2 for SWorld#getLivingEntities The field does not exist on Spigot (located in another class?). But `#getEntities()` does exactly what we need and Paper-Spigot still has it. SD-9374 SD-9377 SD-9392 SD-9401 --- Core/src/main/java/com/songoda/core/nms/NmsManager.java | 2 +- .../java/com/songoda/core/nms/v1_19_R1/world/SWorldImpl.java | 2 +- .../java/com/songoda/core/nms/v1_19_R1v2/world/SWorldImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/nms/NmsManager.java b/Core/src/main/java/com/songoda/core/nms/NmsManager.java index b895353a..ee047a6b 100644 --- a/Core/src/main/java/com/songoda/core/nms/NmsManager.java +++ b/Core/src/main/java/com/songoda/core/nms/NmsManager.java @@ -134,7 +134,7 @@ public class NmsManager { anvil = new com.songoda.core.nms.v1_19_R1.anvil.AnvilCore(); nbt = new com.songoda.core.nms.v1_19_R1.nbt.NBTCoreImpl(); world = new com.songoda.core.nms.v1_19_R1.world.WorldCoreImpl(); - }else{ + } else { player = new com.songoda.core.nms.v1_19_R1v2.entity.NMSPlayerImpl(); anvil = new com.songoda.core.nms.v1_19_R1v2.anvil.AnvilCore(); nbt = new com.songoda.core.nms.v1_19_R1v2.nbt.NBTCoreImpl(); diff --git a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/SWorldImpl.java b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/SWorldImpl.java index 0706be94..d04a5e36 100644 --- a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/SWorldImpl.java +++ b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/SWorldImpl.java @@ -23,7 +23,7 @@ public class SWorldImpl implements SWorld { List result = new ArrayList<>(); ServerLevel worldServer = ((CraftWorld) world).getHandle(); - LevelEntityGetter entities = worldServer.entityManager.getEntityGetter(); + LevelEntityGetter entities = worldServer.getEntities(); entities.getAll().forEach((mcEnt) -> { org.bukkit.entity.Entity bukkitEntity = mcEnt.getBukkitEntity(); diff --git a/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/SWorldImpl.java b/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/SWorldImpl.java index b4944be1..7ca2e85c 100644 --- a/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/SWorldImpl.java +++ b/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/SWorldImpl.java @@ -23,7 +23,7 @@ public class SWorldImpl implements SWorld { List result = new ArrayList<>(); ServerLevel worldServer = ((CraftWorld) world).getHandle(); - LevelEntityGetter entities = worldServer.entityManager.getEntityGetter(); + LevelEntityGetter entities = worldServer.getEntities(); entities.getAll().forEach((mcEnt) -> { org.bukkit.entity.Entity bukkitEntity = mcEnt.getBukkitEntity();