From d54d2a199ecae4cad89fd637df4e1002097885ac Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 11 Oct 2024 01:56:24 -0500 Subject: [PATCH] Refractor --- .../caseload/knockbacksync/KnockbackSync.java | 1 + .../command/subcommand/StatusSubcommand.java | 36 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/me/caseload/knockbacksync/KnockbackSync.java b/src/main/java/me/caseload/knockbacksync/KnockbackSync.java index d414198..0300517 100644 --- a/src/main/java/me/caseload/knockbacksync/KnockbackSync.java +++ b/src/main/java/me/caseload/knockbacksync/KnockbackSync.java @@ -61,6 +61,7 @@ public final class KnockbackSync extends JavaPlugin { PacketEvents.getAPI().getSettings() .checkForUpdates(false) .debug(false); + PacketEvents.getAPI().load(); PacketEvents.getAPI().init(); diff --git a/src/main/java/me/caseload/knockbacksync/command/subcommand/StatusSubcommand.java b/src/main/java/me/caseload/knockbacksync/command/subcommand/StatusSubcommand.java index 935ff18..fdab98b 100644 --- a/src/main/java/me/caseload/knockbacksync/command/subcommand/StatusSubcommand.java +++ b/src/main/java/me/caseload/knockbacksync/command/subcommand/StatusSubcommand.java @@ -28,30 +28,30 @@ public class StatusSubcommand implements Listener { (globalStatus ? ChatColor.GREEN + "Enabled" : ChatColor.RED + "Disabled")); // Show player status - if (target == null && sender instanceof Player) { + if (target == null && sender instanceof Player) target = (Player) sender; - } - if (target != null) { - if (sender.hasPermission("knockbacksync.status.self") || - (sender.hasPermission("knockbacksync.status.other") && !sender.equals(target))) { + if (target == null) + return; - UUID uuid = target.getUniqueId(); - boolean playerStatus = !PlayerDataManager.containsPlayerData(uuid); + if (sender.hasPermission("knockbacksync.status.self") || + (sender.hasPermission("knockbacksync.status.other") && !sender.equals(target))) { - if (!globalStatus) { - sender.sendMessage(ChatColor.YELLOW + target.getName() + "'s KnockbackSync status: " + - ChatColor.RED + "Disabled (Global toggle is off)"); - } else { - sender.sendMessage(ChatColor.YELLOW + target.getName() + "'s KnockbackSync status: " + - (playerStatus ? ChatColor.GREEN + "Enabled" : ChatColor.RED + "Disabled")); - } + UUID uuid = target.getUniqueId(); + boolean playerStatus = !PlayerDataManager.containsPlayerData(uuid); + + if (!globalStatus) { + sender.sendMessage(ChatColor.YELLOW + target.getName() + "'s KnockbackSync status: " + + ChatColor.RED + "Disabled (Global toggle is off)"); } else { - sender.sendMessage(ChatColor.RED + "You don't have the " - + (sender.equals(target) ? "knockbacksync.status.self" : "knockbacksync.status.other") + - " permission needed to check status for " + - (sender.equals(target) ? "yourself" : "other players") + "."); + sender.sendMessage(ChatColor.YELLOW + target.getName() + "'s KnockbackSync status: " + + (playerStatus ? ChatColor.GREEN + "Enabled" : ChatColor.RED + "Disabled")); } + } else { + sender.sendMessage(ChatColor.RED + "You don't have the " + + (sender.equals(target) ? "knockbacksync.status.self" : "knockbacksync.status.other") + + " permission needed to check status for " + + (sender.equals(target) ? "yourself" : "other players") + "."); } }); }