Bump org.allaymc.allay:api from 0.16.0 to 0.26.0

allay/build.gradle.kts

@@ -1,6 +1,6 @@
 dependencies {
     // Dependencies
-    compileOnly("org.allaymc.allay:api:0.16.0")
+    compileOnly("org.allaymc.allay:api:0.26.0")
 
     // Projects
     api(project(":api"))

allay/src/main/java/org/lushplugins/nbsminecraft/platform/allay/AllayPlatform.java

@@ -4,6 +4,7 @@
 import com.google.common.cache.CacheBuilder;
 import org.allaymc.api.entity.Entity;
 import org.allaymc.api.entity.interfaces.EntityPlayer;
+import org.allaymc.api.player.Player;
 import org.allaymc.api.server.Server;
 import org.allaymc.api.world.Dimension;
 import org.allaymc.api.world.World;
@@ -29,17 +30,22 @@ public class AllayPlatform extends AbstractPlatform {
 
     @Override
     public void playSound(AudioListener listener, String sound, SoundCategory category, float volume, float pitch) {
-        EntityPlayer player = findPlayer(listener);
+        Player player = findPlayer(listener);
         if (player == null) {
             return;
         }
 
-        playSound(player, player.getLocation(), sound, volume, pitch);
+        EntityPlayer entity = player.getControlledEntity();
+        if (entity == null) {
+            return;
+        }
+
+        playSound(player, entity.getLocation(), sound, volume, pitch);
     }
 
     @Override
     public void playSound(AudioListener listener, EntityReference entityReference, String sound, SoundCategory category, float volume, float pitch) {
-        EntityPlayer player = findPlayer(listener);
+        Player player = findPlayer(listener);
         if (player == null) {
             return;
         }
@@ -49,35 +55,38 @@ public void playSound(AudioListener listener, EntityReference entityReference, S
             return;
         }
 
-        playSound(player, player.getLocation(), sound, volume, pitch);
+        playSound(player, entity.getLocation(), sound, volume, pitch);
     }
 
     @Override
     public void playSound(AudioListener listener, SoundLocation location, String sound, SoundCategory category, float volume, float pitch) {
-        EntityPlayer player = findPlayer(listener);
+        Player player = findPlayer(listener);
         if (player == null) {
             return;
         }
 
         playSound(player, AllayConverter.convert(location), sound, volume, pitch);
     }
 
-    private void playSound(EntityPlayer listener, Vector3dc position, String sound, float volume, float pitch) {
+    private void playSound(Player listener, Vector3dc position, String sound, float volume, float pitch) {
         listener.viewSound(new CustomSound(sound, volume, pitch), position, true);
     }
 
-    private @Nullable EntityPlayer findPlayer(EntityReference entityReference) {
+    private @Nullable Player findPlayer(EntityReference entityReference) {
         Entity entity = entityCache.getIfPresent(entityReference.uuid());
-        if (!(entity instanceof EntityPlayer player) || player.isDisconnected()) {
-            EntityPlayer player = Server.getInstance().getPlayerManager().getPlayers().get(entityReference.uuid());
-            if (player != null) {
-                entityCache.put(entityReference.uuid(), player);
+        if (entity instanceof EntityPlayer playerEntity) {
+            Player player = playerEntity.getController();
+            if (player != null && player.isConnected()) {
+                return player;
             }
+        }
 
-            return player;
-        } else {
-            return player;
+        Player player = Server.getInstance().getPlayerManager().getPlayers().get(entityReference.uuid());
+        if (player != null) {
+            entityCache.put(entityReference.uuid(), player.getControlledEntity());
         }
+
+        return player;
     }
 
     private @Nullable Entity findEntity(EntityReference entityReference) {