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

fix punishments not being retrieved from sql

Browse Source
This commit is contained in:
Taah
2022-04-11 00:53:09 -07:00
parent c92a4bbdb9
commit c071195aaf
3 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/dev/plex/command/impl/BanCMD.java
View File

@ -14,9 +14,6 @@ import dev.plex.punishment.PunishmentType;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexLog;
import dev.plex.util.PlexUtils;
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;
import net.kyori.adventure.text.Component;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
@ -25,6 +22,10 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;
@CommandParameters(name = "ban", usage = "/<command> <player> [reason]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online")
@CommandPermissions(level = Rank.ADMIN, permission = "plex.ban", source = RequiredCommandSource.ANY)
@ -47,15 +48,18 @@ public class BanCMD extends PlexCommand
PlexPlayer plexPlayer = DataUtils.getPlayer(targetUUID);
Player player = Bukkit.getPlayer(targetUUID);
if (isAdmin(plexPlayer))
if (plugin.getSystem().equalsIgnoreCase("ranks"))
{
if (!isConsole(sender))
if (isAdmin(plexPlayer))
{
assert playerSender != null;
PlexPlayer plexPlayer1 = getPlexPlayer(playerSender);
if (!plexPlayer1.getRankFromString().isAtLeast(plexPlayer.getRankFromString()))
if (!isConsole(sender))
{
return messageComponent("higherRankThanYou");
assert playerSender != null;
PlexPlayer plexPlayer1 = getPlexPlayer(playerSender);
if (!plexPlayer1.getRankFromString().isAtLeast(plexPlayer.getRankFromString()))
{
return messageComponent("higherRankThanYou");
}
}
}
}
@ -74,8 +78,7 @@ public class BanCMD extends PlexCommand
{
reason = StringUtils.join(args, " ", 1, args.length);
punishment.setReason(reason);
}
else
} else
{
punishment.setReason("No reason provided.");
}