InfStarMC/EssentialsC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 完善插件稳定性与兼容性
Build / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Coldsmile
2026-08-01 00:36:17 +08:00
parent 5c760b26c6
commit 18cfbc2002
44 changed files with 1523 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java
+62 -48
View File
@@ -4,7 +4,6 @@ import cn.infstar.essentialsC.EssentialsC;
import cn.infstar.essentialsC.ModuleManager;
import cn.infstar.essentialsC.tpsbar.TpsBarService;
import java.lang.reflect.Constructor;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -12,6 +11,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
public final class CommandRegistry {
@@ -21,52 +21,57 @@ public final class CommandRegistry {
private static final Set<String> UNAVAILABLE_COMMANDS = new java.util.HashSet<>();
static {
register("workbench", "essentialsc.command.workbench", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.WorkbenchCommand", "wb");
register("anvil", "essentialsc.command.anvil", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.AnvilCommand");
register("cartographytable", "essentialsc.command.cartographytable", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.CartographyTableCommand", "ct", "cartography");
register("grindstone", "essentialsc.command.grindstone", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.GrindstoneCommand", "gs");
register("loom", "essentialsc.command.loom", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.LoomCommand");
register("smithingtable", "essentialsc.command.smithingtable", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.SmithingTableCommand", "st", "smithing");
register("stonecutter", "essentialsc.command.stonecutter", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.StonecutterCommand", "sc");
register("enderchest", "essentialsc.command.enderchest", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.EnderChestCommand", "ec");
register("blocks", "essentialsc.command.blocks", ModuleManager.BLOCKS, "cn.infstar.essentialsC.commands.BlocksMenuCommand");
register("hat", "essentialsc.command.hat", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.HatCommand");
register("suicide", "essentialsc.command.suicide", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.SuicideCommand", "die");
register("fly", "essentialsc.command.fly", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.FlyCommand");
register("nightvision", "essentialsc.command.nightvision", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.NightVisionCommand", "nv");
register("glow", "essentialsc.command.glow", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.GlowCommand");
register("heal", "essentialsc.command.heal", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.HealCommand");
register("vanish", "essentialsc.command.vanish", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.VanishCommand", "v");
register("seen", "essentialsc.command.seen", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.SeenCommand", "info");
register("feed", "essentialsc.command.feed", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.FeedCommand");
register("repair", "essentialsc.command.repair", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.RepairCommand", "rep");
register("tpa", "essentialsc.command.tpa", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaCommand");
register("tpahere", "essentialsc.command.tpahere", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaHereCommand");
register("tpaall", "essentialsc.command.tpaall", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaAllCommand");
register("tpaccept", "essentialsc.command.tpaccept", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpAcceptCommand", "tpyes");
register("tpdeny", "essentialsc.command.tpdeny", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpDenyCommand", "tpdecline", "tpno");
register("tpignore", "essentialsc.command.tpignore", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpIgnoreCommand");
register("tpsbar", "essentialsc.command.tpsbar", ModuleManager.TPSBAR, "cn.infstar.essentialsC.commands.TpsBarCommand");
register("mobdrops", "essentialsc.mobdrops.enderman", ModuleManager.MOB_DROPS, "cn.infstar.essentialsC.commands.MobDropCommand");
register("maintenance", "essentialsc.command.maintenance", ModuleManager.MAINTENANCE, "cn.infstar.essentialsC.commands.MaintenanceCommand", "maint");
registerSubCommand("admin", "essentialsc.command.admin", ModuleManager.ADMIN_MODE, "cn.infstar.essentialsC.commands.AdminCommand");
registerSubCommand("skin", "essentialsc.command.skin", ModuleManager.SKIN_BRIDGE, "cn.infstar.essentialsC.commands.SkinBridgeCommand");
register("workbench", "essentialsc.command.workbench", ModuleManager.BLOCKS, WorkbenchCommand::new, "wb");
register("anvil", "essentialsc.command.anvil", ModuleManager.BLOCKS, AnvilCommand::new);
register("cartographytable", "essentialsc.command.cartographytable", ModuleManager.BLOCKS, CartographyTableCommand::new, "ct", "cartography");
register("grindstone", "essentialsc.command.grindstone", ModuleManager.BLOCKS, GrindstoneCommand::new, "gs");
register("loom", "essentialsc.command.loom", ModuleManager.BLOCKS, LoomCommand::new);
register("smithingtable", "essentialsc.command.smithingtable", ModuleManager.BLOCKS, SmithingTableCommand::new, "st", "smithing");
register("stonecutter", "essentialsc.command.stonecutter", ModuleManager.BLOCKS, StonecutterCommand::new, "sc");
register("enderchest", "essentialsc.command.enderchest", ModuleManager.BLOCKS, EnderChestCommand::new, "ec");
register("blocks", "essentialsc.command.blocks", ModuleManager.BLOCKS, BlocksMenuCommand::new);
registerCore("hat", "essentialsc.command.hat", HatCommand::new);
registerCore("suicide", "essentialsc.command.suicide", SuicideCommand::new, "die");
registerCore("fly", "essentialsc.command.fly", FlyCommand::new);
registerCore("nightvision", "essentialsc.command.nightvision", NightVisionCommand::new, "nv");
registerCore("glow", "essentialsc.command.glow", GlowCommand::new);
registerCore("heal", "essentialsc.command.heal", HealCommand::new);
registerCore("vanish", "essentialsc.command.vanish", VanishCommand::new, "v");
registerCore("seen", "essentialsc.command.seen", SeenCommand::new, "info");
registerCore("feed", "essentialsc.command.feed", FeedCommand::new);
registerCore("repair", "essentialsc.command.repair", RepairCommand::new, "rep");
registerCore("tpa", "essentialsc.command.tpa", TpaCommand::new);
registerCore("tpahere", "essentialsc.command.tpahere", TpaHereCommand::new);
registerCore("tpaall", "essentialsc.command.tpaall", TpaAllCommand::new);
registerCore("tpaccept", "essentialsc.command.tpaccept", TpAcceptCommand::new, "tpyes");
registerCore("tpdeny", "essentialsc.command.tpdeny", TpDenyCommand::new, "tpdecline", "tpno");
registerCore("tpignore", "essentialsc.command.tpignore", TpIgnoreCommand::new);
register("tpsbar", "essentialsc.command.tpsbar", ModuleManager.TPSBAR, TpsBarCommand::new);
register("mobdrops", "essentialsc.mobdrops.enderman", ModuleManager.MOB_DROPS, MobDropCommand::new);
register("maintenance", "essentialsc.command.maintenance", ModuleManager.MAINTENANCE, MaintenanceCommand::new, "maint");
registerSubCommand("admin", "essentialsc.command.admin", ModuleManager.ADMIN_MODE, AdminCommand::new);
registerSubCommand("skin", "essentialsc.command.skin", ModuleManager.SKIN_BRIDGE, SkinBridgeCommand::new);
}
private CommandRegistry() {
}
private static void register(String name, String permission, String moduleKey, String className, String... aliases) {
register(name, permission, moduleKey, className, true, aliases);
private static void registerCore(String name, String permission, Supplier<BaseCommand> factory, String... aliases) {
register(name, permission, null, factory, aliases);
}
private static void registerSubCommand(String name, String permission, String moduleKey, String className, String... aliases) {
register(name, permission, moduleKey, className, false, aliases);
private static void register(String name, String permission, String moduleKey, Supplier<BaseCommand> factory, String... aliases) {
register(name, permission, moduleKey, factory, true, aliases);
}
private static void register(String name, String permission, String moduleKey, String className, boolean standalone, String... aliases) {
private static void registerSubCommand(String name, String permission, String moduleKey, Supplier<BaseCommand> factory, String... aliases) {
register(name, permission, moduleKey, factory, false, aliases);
}
private static void register(String name, String permission, String moduleKey, Supplier<BaseCommand> factory,
boolean standalone, String... aliases) {
List<String> aliasList = List.of(aliases);
CommandSpec spec = new CommandSpec(name, permission, moduleKey, className, aliasList, standalone);
CommandSpec spec = new CommandSpec(name, permission, moduleKey, factory, aliasList, standalone);
COMMANDS.put(name, spec);
ALIAS_TO_COMMAND.put(name, name);
for (String alias : aliasList) {
@@ -86,7 +91,8 @@ public final class CommandRegistry {
}
public static boolean isAvailable(String name) {
return getCommand(name) != null;
String resolvedName = resolveCommandName(name);
return resolvedName != null && !isRuntimeDisabled(resolvedName) && getRegisteredCommand(resolvedName) != null;
}
public static String getPermission(String name) {
@@ -104,6 +110,15 @@ public final class CommandRegistry {
return null;
}
return getRegisteredCommand(resolvedName);
}
public static BaseCommand getRegisteredCommand(String name) {
String resolvedName = resolveCommandName(name);
if (resolvedName == null) {
return null;
}
BaseCommand cached = COMMAND_CACHE.get(resolvedName);
if (cached != null) {
return cached;
@@ -118,18 +133,16 @@ public final class CommandRegistry {
}
try {
Class<?> rawClass = Class.forName(spec.className());
if (!BaseCommand.class.isAssignableFrom(rawClass)) {
UNAVAILABLE_COMMANDS.add(resolvedName);
return null;
}
Constructor<? extends BaseCommand> constructor = rawClass.asSubclass(BaseCommand.class).getDeclaredConstructor();
BaseCommand command = constructor.newInstance();
BaseCommand command = spec.factory().get();
COMMAND_CACHE.put(resolvedName, command);
return command;
} catch (ReflectiveOperationException | LinkageError ignored) {
} catch (RuntimeException | LinkageError exception) {
UNAVAILABLE_COMMANDS.add(resolvedName);
try {
EssentialsC.getPlugin(EssentialsC.class).getLogger()
.warning("初始化命令 /" + resolvedName + " 失败: " + exception.getMessage());
} catch (IllegalStateException ignored) {
}
return null;
}
}
@@ -168,6 +181,7 @@ public final class CommandRegistry {
UNAVAILABLE_COMMANDS.clear();
}
public record CommandSpec(String name, String permission, String moduleKey, String className, List<String> aliases, boolean standalone) {
public record CommandSpec(String name, String permission, String moduleKey, Supplier<BaseCommand> factory,
List<String> aliases, boolean standalone) {
}
}
src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java
+12 -2
View File
@@ -354,7 +354,14 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
if (subCmd.equals("skin") && sender.hasPermission("essentialsc.command.skin")) {
String partial = args[1].toLowerCase();
return List.of("status", "refresh").stream()
List<String> actions = new ArrayList<>();
if (sender.hasPermission("essentialsc.command.skin.status")) {
actions.add("status");
}
if (sender.hasPermission("essentialsc.command.skin.refresh")) {
actions.add("refresh");
}
return actions.stream()
.filter(option -> option.startsWith(partial))
.toList();
}
@@ -386,7 +393,10 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
if (args.length == 3 && args[0].equalsIgnoreCase("skin")
&& (args[1].equalsIgnoreCase("status") || args[1].equalsIgnoreCase("refresh"))
&& sender.hasPermission("essentialsc.command.skin")) {
&& sender.hasPermission("essentialsc.command.skin.others")
&& sender.hasPermission(args[1].equalsIgnoreCase("status")
? "essentialsc.command.skin.status"
: "essentialsc.command.skin.refresh")) {
List<String> players = new ArrayList<>();
String partial = args[2].toLowerCase();
for (Player player : Bukkit.getOnlinePlayers()) {
src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java
+2 -2
View File
@@ -42,8 +42,8 @@ public class MobDropCommand extends BaseCommand {
public static void openMobDropMenu(EssentialsC plugin, Player player) {
var lang = EssentialsC.getLangManager();
boolean endermanEnabled = plugin.getConfig().getBoolean("mob-drops.enderman.enabled", true);
String status = lang.getString(endermanEnabled
boolean endermanDropsAllowed = plugin.getConfig().getBoolean("mob-drops.enderman.allow-drops", true);
String status = lang.getString(endermanDropsAllowed
? "mobdrops-menu.status.enabled"
: "mobdrops-menu.status.disabled");
src/main/java/cn/infstar/essentialsC/commands/SeenCommand.java
+10 -14
View File
@@ -1,7 +1,6 @@
package cn.infstar.essentialsC.commands;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
@@ -29,30 +28,27 @@ public class SeenCommand extends BaseCommand {
}
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
StringBuilder info = new StringBuilder();
info.append(getLang().getPrefix()).append(ChatColor.GOLD).append("玩家信息: ")
.append(ChatColor.WHITE).append(target.getName()).append("\n");
player.sendMessage(getLang().getPrefixedComponent("messages.seen-header",
Map.of("player", String.valueOf(target.getName()))));
if (target.isOnline()) {
info.append(ChatColor.GRAY).append("状态: ").append(ChatColor.GREEN).append("在线").append("\n");
player.sendMessage(getLang().getComponent("messages.seen-status-online"));
Player onlinePlayer = target.getPlayer();
if (onlinePlayer != null) {
info.append(ChatColor.GRAY).append("所在世界: ").append(ChatColor.WHITE)
.append(onlinePlayer.getWorld().getName()).append("\n");
player.sendMessage(getLang().getComponent("messages.seen-world",
Map.of("world", onlinePlayer.getWorld().getName())));
}
} else {
info.append(ChatColor.GRAY).append("状态: ").append(ChatColor.RED).append("离线").append("\n");
player.sendMessage(getLang().getComponent("messages.seen-status-offline"));
long lastSeen = target.getLastSeen();
if (lastSeen > 0) {
info.append(ChatColor.GRAY).append("最后在线: ").append(ChatColor.WHITE)
.append(format.format(new Date(lastSeen))).append("\n");
player.sendMessage(getLang().getComponent("messages.seen-last-online",
Map.of("time", format.format(new Date(lastSeen)))));
}
}
info.append(ChatColor.GRAY).append("首次加入: ").append(ChatColor.WHITE)
.append(format.format(new Date(target.getFirstPlayed())));
player.sendMessage(info.toString());
player.sendMessage(getLang().getComponent("messages.seen-first-joined",
Map.of("time", format.format(new Date(target.getFirstPlayed())))));
return true;
}
}
src/main/java/cn/infstar/essentialsC/commands/SkinBridgeCommand.java
+51 -7
View File
@@ -14,6 +14,10 @@ import java.util.Map;
public final class SkinBridgeCommand extends BaseCommand implements TabCompleter {
private static final String STATUS_PERMISSION = "essentialsc.command.skin.status";
private static final String REFRESH_PERMISSION = "essentialsc.command.skin.refresh";
private static final String OTHERS_PERMISSION = "essentialsc.command.skin.others";
public SkinBridgeCommand() {
super("essentialsc.command.skin");
}
@@ -54,11 +58,29 @@ public final class SkinBridgeCommand extends BaseCommand implements TabCompleter
}
String action = args[0].toLowerCase(Locale.ROOT);
boolean targetsOther = sender instanceof Player playerSender
&& !playerSender.getUniqueId().equals(target.getUniqueId());
if (action.equals("status")) {
if (!hasPermission(sender, STATUS_PERMISSION)) {
sendNoPermission(sender, STATUS_PERMISSION);
return true;
}
if (targetsOther && !hasPermission(sender, OTHERS_PERMISSION)) {
sendNoPermission(sender, OTHERS_PERMISSION);
return true;
}
sendStatus(sender, target, manager);
return true;
}
if (action.equals("refresh")) {
if (!hasPermission(sender, REFRESH_PERMISSION)) {
sendNoPermission(sender, REFRESH_PERMISSION);
return true;
}
if (targetsOther && !hasPermission(sender, OTHERS_PERMISSION)) {
sendNoPermission(sender, OTHERS_PERMISSION);
return true;
}
sendRefreshResult(sender, target, manager.queueSync(target, true));
return true;
}
@@ -67,11 +89,15 @@ public final class SkinBridgeCommand extends BaseCommand implements TabCompleter
return true;
}
private boolean hasPermission(CommandSender sender, String permission) {
return !(sender instanceof Player) || sender.hasPermission(permission);
}
private void sendNoPermission(CommandSender sender, String permission) {
sender.sendMessage(getLang().getPrefixedString("messages.no-permission", Map.of("permission", permission)));
}
private void sendStatus(CommandSender sender, Player target, SkinBridgeManager manager) {
if (!manager.isEnabled()) {
sender.sendMessage(getLang().getPrefixedString("skin-bridge.messages.feature-disabled"));
return;
}
if (!manager.isSkinGatewayAvailable()) {
sender.sendMessage(getLang().getPrefixedString("skin-bridge.messages.dependency-missing"));
return;
@@ -85,6 +111,7 @@ public final class SkinBridgeCommand extends BaseCommand implements TabCompleter
Map<String, String> placeholders = Map.of("player", target.getName(), "provider", String.valueOf(status.providerId()));
switch (status.state()) {
case EXTERNAL -> sender.sendMessage(getLang().getPrefixedString("skin-bridge.messages.status-external", placeholders));
case EXCLUDED -> sender.sendMessage(getLang().getPrefixedString("skin-bridge.messages.status-excluded", placeholders));
case NOT_EXTERNAL -> sender.sendMessage(getLang().getPrefixedString("skin-bridge.messages.status-not-external", placeholders));
case PENDING -> sender.sendMessage(getLang().getPrefixedString("skin-bridge.messages.status-pending", placeholders));
case UNKNOWN -> sender.sendMessage(getLang().getPrefixedString("skin-bridge.messages.status-unknown", placeholders));
@@ -97,10 +124,18 @@ public final class SkinBridgeCommand extends BaseCommand implements TabCompleter
case QUEUED -> "skin-bridge.messages.refresh-queued";
case CACHED -> "skin-bridge.messages.refresh-cached";
case ALREADY_RUNNING -> "skin-bridge.messages.refresh-running";
case FEATURE_DISABLED -> "skin-bridge.messages.feature-disabled";
case EXCLUDED -> "skin-bridge.messages.refresh-excluded";
case QUEUE_FULL -> "skin-bridge.messages.queue-full";
case DEPENDENCY_MISSING -> "skin-bridge.messages.dependency-missing";
case NO_PROVIDERS -> "skin-bridge.messages.no-providers";
case REFRESH_COOLDOWN -> "skin-bridge.messages.refresh-cooldown";
};
if (result == SkinBridgeManager.SyncResult.REFRESH_COOLDOWN) {
placeholders = Map.of(
"player", target.getName(),
"seconds", String.valueOf(plugin.getSkinBridgeManager().getRemainingForceRefreshCooldownSeconds(target))
);
}
sender.sendMessage(getLang().getPrefixedString(messagePath, placeholders));
}
@@ -108,11 +143,20 @@ public final class SkinBridgeCommand extends BaseCommand implements TabCompleter
public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
if (args.length == 1) {
String partial = args[0].toLowerCase(Locale.ROOT);
return List.of("status", "refresh").stream()
List<String> actions = new ArrayList<>();
if (hasPermission(sender, STATUS_PERMISSION)) {
actions.add("status");
}
if (hasPermission(sender, REFRESH_PERMISSION)) {
actions.add("refresh");
}
return actions.stream()
.filter(option -> option.startsWith(partial))
.toList();
}
if (args.length == 2 && (args[0].equalsIgnoreCase("status") || args[0].equalsIgnoreCase("refresh"))) {
if (args.length == 2 && hasPermission(sender, OTHERS_PERMISSION)
&& ((args[0].equalsIgnoreCase("status") && hasPermission(sender, STATUS_PERMISSION))
|| (args[0].equalsIgnoreCase("refresh") && hasPermission(sender, REFRESH_PERMISSION)))) {
String partial = args[1].toLowerCase(Locale.ROOT);
List<String> players = new ArrayList<>();
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
src/main/java/cn/infstar/essentialsC/commands/TpaCommand.java
+3
View File
@@ -66,6 +66,9 @@ public class TpaCommand extends BaseCommand implements TabCompleter {
Map.of("seconds", String.valueOf(createdRequest.cooldownSeconds()))));
return true;
}
if (createdRequest.status() == TeleportRequestManager.CreateRequestStatus.CANCELLED) {
return true;
}
TeleportRequestManager.TeleportRequest request = createdRequest.request();
Map<String, String> placeholders = manager.placeholders(request);
src/main/java/cn/infstar/essentialsC/commands/VanishCommand.java
+55 -3
View File
@@ -1,8 +1,12 @@
package cn.infstar.essentialsC.commands;
import cn.infstar.essentialsC.EssentialsC;
import cn.infstar.essentialsC.util.AtomicYamlWriter;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
@@ -10,6 +14,8 @@ import java.util.UUID;
public class VanishCommand extends BaseCommand {
private static final Set<UUID> vanishedPlayers = new HashSet<>();
public static final String SEE_PERMISSION = "essentialsc.vanish.see";
private static File stateFile;
public VanishCommand() {
super("essentialsc.command.vanish");
@@ -28,10 +34,30 @@ public class VanishCommand extends BaseCommand {
hidePlayerFromAll(plugin, player);
player.sendMessage(getLang().getPrefixedString("messages.vanish-enabled"));
}
saveState(plugin);
return true;
}
public static void loadState(EssentialsC plugin) {
stateFile = new File(plugin.getDataFolder(), "vanished-players.yml");
vanishedPlayers.clear();
if (!stateFile.exists()) {
return;
}
FileConfiguration state = YamlConfiguration.loadConfiguration(stateFile);
for (String value : state.getStringList("players")) {
try {
vanishedPlayers.add(UUID.fromString(value));
} catch (IllegalArgumentException ignored) {
plugin.getLogger().warning("忽略无效的隐身玩家 UUID: " + value);
}
}
}
public static void hideVanishedPlayersFrom(EssentialsC plugin, Player observer) {
if (observer.hasPermission(SEE_PERMISSION)) {
return;
}
for (Player vanished : plugin.getServer().getOnlinePlayers()) {
if (!observer.equals(vanished) && isVanished(vanished)) {
observer.hidePlayer(plugin, vanished);
@@ -39,8 +65,21 @@ public class VanishCommand extends BaseCommand {
}
}
public static void removeVanished(Player player) {
vanishedPlayers.remove(player.getUniqueId());
public static void restoreVisibility(EssentialsC plugin, Player player, boolean notify) {
if (!vanishedPlayers.remove(player.getUniqueId())) {
return;
}
showPlayerToAll(plugin, player);
saveState(plugin);
if (notify) {
player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.vanish-permission-removed"));
}
}
public static void applyHiddenState(EssentialsC plugin, Player player) {
if (isVanished(player)) {
hidePlayerFromAll(plugin, player);
}
}
public static void clearAll(EssentialsC plugin) {
@@ -54,7 +93,7 @@ public class VanishCommand extends BaseCommand {
private static void hidePlayerFromAll(EssentialsC plugin, Player player) {
for (Player online : player.getServer().getOnlinePlayers()) {
if (online != player) {
if (online != player && !online.hasPermission(SEE_PERMISSION)) {
online.hidePlayer(plugin, player);
}
}
@@ -71,4 +110,17 @@ public class VanishCommand extends BaseCommand {
public static boolean isVanished(Player player) {
return vanishedPlayers.contains(player.getUniqueId());
}
private static void saveState(EssentialsC plugin) {
if (stateFile == null) {
stateFile = new File(plugin.getDataFolder(), "vanished-players.yml");
}
FileConfiguration state = new YamlConfiguration();
state.set("players", vanishedPlayers.stream().map(UUID::toString).sorted().toList());
try {
AtomicYamlWriter.save(state, stateFile);
} catch (Exception exception) {
plugin.getLogger().warning("保存 vanished-players.yml 失败: " + exception.getMessage());
}
}
}