Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-01 15:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix many bugs

Browse Source
This commit is contained in:
Telesphoreo
2022-03-18 20:12:05 -05:00
parent d8c6c3b4a8
commit 6a569bb638
8 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/dev/plex/command/impl/AdminChatCMD.java
View File

@ -1,13 +1,16 @@
package dev.plex.command.impl;
import dev.plex.cache.PlayerCache;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.source.RequiredCommandSource;
import dev.plex.listener.impl.ChatListener;
import dev.plex.player.PlexPlayer;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils;
import net.kyori.adventure.text.Component;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
@ -25,7 +28,30 @@ public class AdminChatCMD extends PlexCommand
return usage();
}
ChatListener.adminChat(sender, StringUtils.join(args, " "));
adminChat(sender, StringUtils.join(args, " "));
return null;
}
private void adminChat(CommandSender sender, String message)
{
for (Player player : Bukkit.getOnlinePlayers())
{
if (plugin.getSystem().equalsIgnoreCase("ranks"))
{
PlexPlayer plexPlayer = PlayerCache.getPlexPlayerMap().get(player.getUniqueId());
if (plexPlayer.getRankFromString().isAtLeast(Rank.ADMIN))
{
player.sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
}
}
else if (plugin.getSystem().equalsIgnoreCase("permissions"))
{
if (player.hasPermission("plex.adminchat"))
{
player.sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
}
}
}
plugin.getServer().getConsoleSender().sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
}
}

6
src/main/java/dev/plex/command/impl/TagCMD.java
View File

@ -55,7 +55,7 @@ public class TagCMD extends PlexCommand
return messageComponent("maximumPrefixLength", plugin.config.getInt("chat.max-tag-length", 16));
}
player.setPrefix(Component.text(MiniMessage.miniMessage().serialize(convertedComponent)));
player.setPrefix(MiniMessage.miniMessage().serialize(convertedComponent));
return messageComponent("prefixSetTo", MiniMessage.miniMessage().serialize(convertedComponent));
}
@ -69,14 +69,14 @@ public class TagCMD extends PlexCommand
}
PlexPlayer player = DataUtils.getPlayer(playerSender.getUniqueId());
player.setPrefix(null);
player.setPrefix("");
return messageComponent("prefixCleared");
}
checkRank(sender, Rank.ADMIN, "plex.tag.clear.others");
Player target = getNonNullPlayer(args[1]);
PlexPlayer plexTarget = DataUtils.getPlayer(target.getUniqueId());
plexTarget.setPrefix(null);
plexTarget.setPrefix("");
messageComponent("otherPrefixCleared");
}
return usage();