From bfe5be620896a682fefe056f7d07a95a67ba5513 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Sun, 8 Jan 2023 21:06:47 +0800 Subject: [PATCH] up --- .../java/coloryr/allmusic/side/bc/SideBC.java | 23 ++++++++---- .../allmusic/side/velocity/SideVelocity.java | 37 ++++++++++--------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/src/main/java/coloryr/allmusic/side/bc/SideBC.java b/src/main/java/coloryr/allmusic/side/bc/SideBC.java index 2298f794..2e3196b8 100644 --- a/src/main/java/coloryr/allmusic/side/bc/SideBC.java +++ b/src/main/java/coloryr/allmusic/side/bc/SideBC.java @@ -144,7 +144,7 @@ public class SideBC extends ISide { public void sendHudLyric(String data) { try { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (AllMusic.isOK(player.getName(), player.getServer().getInfo().getName(), true)) + if (ok(player)) continue; SaveOBJ obj = HudUtils.get(player.getName()); if (!obj.EnableLyric) @@ -161,7 +161,7 @@ public class SideBC extends ISide { public void sendHudInfo(String data) { try { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (AllMusic.isOK(player.getName(), player.getServer().getInfo().getName(), true)) + if (ok(player)) continue; SaveOBJ obj = HudUtils.get(player.getName()); if (!obj.EnableInfo) @@ -178,7 +178,7 @@ public class SideBC extends ISide { public void sendHudList(String data) { try { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (AllMusic.isOK(player.getName(), player.getServer().getInfo().getName(), true)) + if (ok(player)) continue; String name = player.getName(); SaveOBJ obj = HudUtils.get(name); @@ -223,7 +223,8 @@ public class SideBC extends ISide { public void sendMusic(String url) { try { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (AllMusic.isOK(player.getName(), player.getServer().getInfo().getName(), false)) + String server = player.getServer() == null ? null : player.getServer().getInfo().getName(); + if (AllMusic.isOK(player.getName(), server, false)) continue; send(player, ComType.play + url); AllMusic.addNowPlayPlayer(player.getName()); @@ -240,7 +241,8 @@ public class SideBC extends ISide { ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player); if (player1 == null) return; - if (AllMusic.isOK(player1.getName(), player1.getServer().getInfo().getName(), false)) + String server = player1.getServer() == null ? null : player1.getServer().getInfo().getName(); + if (AllMusic.isOK(player1.getName(), server, false)) return; send(player, ComType.play + url); } catch (Exception e) { @@ -253,7 +255,7 @@ public class SideBC extends ISide { public void sendPic(String url) { try { for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) { - if (AllMusic.isOK(player.getName(), player.getServer().getInfo().getName(), true)) + if (ok(player)) continue; String name = player.getName(); SaveOBJ obj = HudUtils.get(name); @@ -273,7 +275,7 @@ public class SideBC extends ISide { ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player); if (player1 == null) return; - if (AllMusic.isOK(player1.getName(), player1.getServer().getInfo().getName(), true)) + if (ok(player1)) return; send(player, ComType.img + url); } catch (Exception e) { @@ -288,7 +290,7 @@ public class SideBC extends ISide { ProxiedPlayer player1 = ProxyServer.getInstance().getPlayer(player); if (player1 == null) return; - if (AllMusic.isOK(player1.getName(), player1.getServer().getInfo().getName(), true)) + if (ok(player1)) return; send(player, ComType.pos + pos); } catch (Exception e) { @@ -496,4 +498,9 @@ public class SideBC extends ISide { e.printStackTrace(); } } + + private boolean ok(ProxiedPlayer player) { + String server = player.getServer() == null ? null : player.getServer().getInfo().getName(); + return AllMusic.isOK(player.getName(), server, true); + } } diff --git a/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java b/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java index 67c6db82..5c36e85b 100644 --- a/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java +++ b/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java @@ -203,8 +203,9 @@ public class SideVelocity extends ISide { public void sendMusic(String url) { try { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (AllMusic.isOK(player.getUsername(), - player.getCurrentServer().get().getServerInfo().getName(), false)) + String server = player.getCurrentServer().isPresent() ? + player.getCurrentServer().get().getServerInfo().getName() : null; + if (AllMusic.isOK(player.getUsername(), server, false)) continue; send(player, ComType.play + url); AllMusic.addNowPlayPlayer(player.getUsername()); @@ -220,8 +221,9 @@ public class SideVelocity extends ISide { try { if (AllMusicVelocity.plugin.server.getPlayer(player).isPresent()) { Player player1 = AllMusicVelocity.plugin.server.getPlayer(player).get(); - if (AllMusic.isOK(player1.getUsername(), - player1.getCurrentServer().get().getServerInfo().getName(), false)) + String server = player1.getCurrentServer().isPresent() ? + player1.getCurrentServer().get().getServerInfo().getName() : null; + if (AllMusic.isOK(player1.getUsername(), server, false)) return; send(player, ComType.play + url); } @@ -235,8 +237,7 @@ public class SideVelocity extends ISide { public void sendPic(String url) { try { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (AllMusic.isOK(player.getUsername(), - player.getCurrentServer().get().getServerInfo().getName(), true)) + if (ok(player)) continue; String name = player.getUsername(); SaveOBJ obj = HudUtils.get(name); @@ -255,8 +256,7 @@ public class SideVelocity extends ISide { try { if (AllMusicVelocity.plugin.server.getPlayer(player).isPresent()) { Player player1 = AllMusicVelocity.plugin.server.getPlayer(player).get(); - if (AllMusic.isOK(player1.getUsername(), - player1.getCurrentServer().get().getServerInfo().getName(), true)) + if (ok(player1)) return; send(player, ComType.img + url); } @@ -271,8 +271,7 @@ public class SideVelocity extends ISide { try { if (AllMusicVelocity.plugin.server.getPlayer(player).isPresent()) { Player player1 = AllMusicVelocity.plugin.server.getPlayer(player).get(); - if (AllMusic.isOK(player1.getUsername(), - player1.getCurrentServer().get().getServerInfo().getName(), true)) + if (ok(player1)) return; send(player, ComType.pos + pos); } @@ -286,8 +285,7 @@ public class SideVelocity extends ISide { public void sendHudLyric(String data) { try { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (AllMusic.isOK(player.getUsername(), - player.getCurrentServer().get().getServerInfo().getName(), true)) + if (ok(player)) continue; SaveOBJ obj = HudUtils.get(player.getUsername()); if (!obj.EnableLyric) @@ -304,8 +302,7 @@ public class SideVelocity extends ISide { public void sendHudInfo(String data) { try { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (AllMusic.isOK(player.getUsername(), - player.getCurrentServer().get().getServerInfo().getName(), true)) + if (ok(player)) continue; SaveOBJ obj = HudUtils.get(player.getUsername()); if (!obj.EnableInfo) @@ -322,8 +319,7 @@ public class SideVelocity extends ISide { public void sendHudList(String data) { try { for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { - if (AllMusic.isOK(player.getUsername(), - player.getCurrentServer().get().getServerInfo().getName(), true)) + if (ok(player)) continue; String name = player.getUsername(); SaveOBJ obj = HudUtils.get(name); @@ -357,8 +353,7 @@ public class SideVelocity extends ISide { Component message = Component.text(data); for (Player player : AllMusicVelocity.plugin.server.getAllPlayers()) { try { - if (AllMusic.isOK(player.getUsername(), - player.getCurrentServer().get().getServerInfo().getName(), true)) + if (ok(player)) continue; player.sendActionBar(message); } catch (Exception e1) { @@ -513,4 +508,10 @@ public class SideVelocity extends ISide { e.printStackTrace(); } } + + private boolean ok(Player player) { + String server = player.getCurrentServer().isPresent() ? + player.getCurrentServer().get().getServerInfo().getName() : null; + return AllMusic.isOK(player.getUsername(), server, true); + } }