Freezy-Studios/BlazeSMP
1
0
Fork 0
mirror of https://github.com/Freezy-Studios/BlazeSMP.git synced 2025-04-21 19:44:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

push

Browse source
This commit is contained in:
EmrageGHC 2025-02-21 16:09:17 +01:00
parent dfa234714c
commit 4f6c790299
3 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/me/freezy/plugins/papermc/blazesmp/command/ClanCommand.java
View file

@ -510,12 +510,10 @@ public class ClanCommand extends SimpleCommand {
player.sendMessage(miniMessage().deserialize(String.format(L4M4.get("error.player_not_in_clan"), newLeaderName))); player.sendMessage(miniMessage().deserialize(String.format(L4M4.get("error.player_not_in_clan"), newLeaderName)));
return true; return true;
} }
if (!currentClan.getMembers().contains(playerUUID)) {
currentClan.getMembers().add(playerUUID);
}
currentClan.setLeaderUUID(newLeaderUUID); currentClan.setLeaderUUID(newLeaderUUID);
if (currentClan.isVice(newLeaderUUID)) { if (currentClan.isVice(newLeaderUUID)) {
currentClan.setViceUUID(null); currentClan.setViceUUID(playerUUID);
} }
currentClan.save(); currentClan.save();
player.sendMessage(miniMessage().deserialize(String.format(L4M4.get("success.leadership_transferred"), newLeaderName))); player.sendMessage(miniMessage().deserialize(String.format(L4M4.get("success.leadership_transferred"), newLeaderName)));

28
src/main/java/me/freezy/plugins/papermc/blazesmp/command/VanishCommand.java
View file

@ -11,14 +11,16 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.HashSet; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Map;
import java.util.UUID; import java.util.UUID;
public class VanishCommand extends SimpleCommand { public class VanishCommand extends SimpleCommand {
private final Set<UUID> vanishedPlayers = new HashSet<>(); private final Map<UUID, Boolean> vanishedPlayers = new HashMap();
private boolean isvanished = true;
public VanishCommand() { public VanishCommand() {
super("vanish"); super("vanish");
@ -26,33 +28,31 @@ public class VanishCommand extends SimpleCommand {
@Override @Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) { if (!(sender instanceof Player player)) {
sender.sendMessage("Du bist kein Spieler!"); sender.sendMessage(L4M4.get("error.not_a_player"));
return false; return false;
} }
Player player = (Player) sender;
if (player.isOp()) { if (player.isOp()) {
for (Player online : Bukkit.getOnlinePlayers()) { for (Player online : Bukkit.getOnlinePlayers()) {
if (isvanished) { if (vanishedPlayers.getOrDefault(player.getUniqueId(), false)) {
player.showPlayer(BlazeSMP.getInstance(), online); 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 { } else {
player.hidePlayer(BlazeSMP.getInstance(), online); 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) { if (vanishedPlayers.getOrDefault(player.getUniqueId(), false)) {
vanishedPlayers.remove(player.getUniqueId()); vanishedPlayers.put(player.getUniqueId(), false);
} else { } else {
vanishedPlayers.add(player.getUniqueId()); vanishedPlayers.put(player.getUniqueId(), true);
} }
} else { } else {
player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.no_permission"))); player.sendMessage(MiniMessage.miniMessage().deserialize(L4M4.get("error.no_permission")));
return false; return false;
} }
isvanished = !isvanished;
return true; return true;
} }

1
src/main/resources/storage/messages.json
View file

@ -147,7 +147,6 @@
"config.reloaded": "<green>Config reloaded!</green>", "config.reloaded": "<green>Config reloaded!</green>",
"error.clan_full": "<red>The clan is full.</red>", "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>", "success.invite_sent": "<green>Invite sent to %s.</green>",
"error.no_permission": "<red>You can't do this.</red>", "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>" "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>"