From 4f6c79029964a7dee471990db4613f287b411f12 Mon Sep 17 00:00:00 2001
From: EmrageGHC <gamerghg2507@gmail.com>
Date: Fri, 21 Feb 2025 16:09:17 +0100
Subject: [PATCH] push

---
 .../papermc/blazesmp/command/ClanCommand.java |  6 ++--
 .../blazesmp/command/VanishCommand.java       | 28 +++++++++----------
 src/main/resources/storage/messages.json      |  1 -
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java
index db6bb82..1382417 100644
--- a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java
@@ -510,12 +510,10 @@ public class ClanCommand extends SimpleCommand {
                     player.sendMessage(miniMessage().deserialize(String.format(L4M4.get("error.player_not_in_clan"), newLeaderName)));
                     return true;
                 }
-                if (!currentClan.getMembers().contains(playerUUID)) {
-                    currentClan.getMembers().add(playerUUID);
-                }
+
                 currentClan.setLeaderUUID(newLeaderUUID);
                 if (currentClan.isVice(newLeaderUUID)) {
-                    currentClan.setViceUUID(null);
+                    currentClan.setViceUUID(playerUUID);
                 }
                 currentClan.save();
                 player.sendMessage(miniMessage().deserialize(String.format(L4M4.get("success.leadership_transferred"), newLeaderName)));
diff --git a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java
index 79bdf69..7e7e5bb 100644
--- a/src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java
+++ b/src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java
@@ -11,14 +11,16 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 import java.util.UUID;
 
 public class VanishCommand extends SimpleCommand {
-    private final Set<UUID> vanishedPlayers = new HashSet<>();
-    private boolean isvanished = true;
+    private final Map<UUID, Boolean> vanishedPlayers = new HashMap();
+
+
+
 
     public VanishCommand() {
         super("vanish");
@@ -26,33 +28,31 @@ public class VanishCommand extends SimpleCommand {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (!(sender instanceof Player)) {
-            sender.sendMessage("Du bist kein Spieler!");
+        if (!(sender instanceof Player player)) {
+            sender.sendMessage(L4M4.get("error.not_a_player"));
             return false;
         }
-        Player player = (Player) sender;
 
         if (player.isOp()) {
             for (Player online : Bukkit.getOnlinePlayers()) {
-                if (isvanished) {
+                if (vanishedPlayers.getOrDefault(player.getUniqueId(), false)) {
                     player.showPlayer(BlazeSMP.getInstance(), online);
-                    online.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("player.join")));
+                    online.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("player.join")).append(player.playerListName()));
                 } else {
                     player.hidePlayer(BlazeSMP.getInstance(), online);
-                    online.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("player.left")));
+                    online.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("player.left")).append(player.playerListName()));
                 }
             }
-            if (isvanished) {
-                vanishedPlayers.remove(player.getUniqueId());
+            if (vanishedPlayers.getOrDefault(player.getUniqueId(), false)) {
+                vanishedPlayers.put(player.getUniqueId(), false);
             } else {
-                vanishedPlayers.add(player.getUniqueId());
+                vanishedPlayers.put(player.getUniqueId(), true);
             }
         } else {
             player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.no_permission")));
             return false;
         }
 
-        isvanished = !isvanished;
         return true;
     }
 
diff --git a/src/main/resources/storage/messages.json b/src/main/resources/storage/messages.json
index d0e2507..04b7b0b 100644
--- a/src/main/resources/storage/messages.json
+++ b/src/main/resources/storage/messages.json
@@ -147,7 +147,6 @@
 
   "config.reloaded": "<green>Config reloaded!</green>",
   "error.clan_full": "<red>The clan is full.</red>",
-  "error.clan_not_found": "<red>Clan not found.</red>",
   "success.invite_sent": "<green>Invite sent to %s.</green>",
   "error.no_permission": "<red>You can't do this.</red>",
   "join.notify": "<green>WICHTIG!!! Die Clans wurden aufgelöst, das aktuelle Clanlimit liegt bei 10 Membern. Jeder hat damit die Chance einen neuen Clan selbst zu gründen, da die großen Clans keine unendliche Kapazität mehr haben.</green>"