attempt to fix #56

amsam0 · Jul 6, 2024 · 8194338 · 8194338
1 parent 3dfc123
commit 8194338
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/paper/src/main/java/dev/naturecodevoid/voicechatdiscord/PaperPlatform.java b/paper/src/main/java/dev/naturecodevoid/voicechatdiscord/PaperPlatform.java
@@ -42,7 +42,12 @@ public ServerPlayer commandContextToPlayer(CommandContext<?> context) {
             // the cast is safe because getBukkitEntity and getBukkitSender return the same thing
             try {
                 net.minecraft.server.level.ServerLevel nmsLevel = (net.minecraft.server.level.ServerLevel) getCraftWorld().getMethod("getHandle").invoke(world);
-                net.minecraft.world.entity.Entity nmsEntity = nmsLevel.getEntity(uuid);
+                net.minecraft.world.entity.Entity nmsEntity;
+                try {
+                    nmsEntity = nmsLevel.moonrise$getEntityLookup().get(uuid);
+                } catch (NoSuchMethodError ignored) {
+                    nmsEntity = nmsLevel.getEntity(uuid);
+                }
                 if (nmsEntity == null) return null;
                 @SuppressWarnings("DataFlowIssue") Entity entity = (Entity) nmsEntity.getBukkitSender(null);
                 return api.createPosition(