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

Cache whether the server is on a proxy or not

Browse Source 
Fix kick where ban message was displayed instead of kick message
This commit is contained in:
Taah
2023-08-24 22:36:14 -07:00
parent b0240ef46e
commit f97411ce09
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,14 +39,14 @@ public class BanCMD extends PlexCommand
return usage();
}
UUID targetUUID = WebUtils.getFromName(args[0]);
final PlexPlayer plexPlayer = DataUtils.getPlayer(args[0]);
if (targetUUID == null || !DataUtils.hasPlayedBefore(targetUUID))
if (plexPlayer == null)
{
throw new PlayerNotFoundException();
}
PlexPlayer plexPlayer = DataUtils.getPlayer(targetUUID);
Player player = Bukkit.getPlayer(targetUUID);
Player player = Bukkit.getPlayer(plexPlayer.getUuid());
if (plugin.getSystem().equalsIgnoreCase("ranks"))
{
@ -64,7 +64,7 @@ public class BanCMD extends PlexCommand
}
}
plugin.getPunishmentManager().isAsyncBanned(targetUUID).whenComplete((aBoolean, throwable) ->
plugin.getPunishmentManager().isAsyncBanned(plexPlayer.getUuid()).whenComplete((aBoolean, throwable) ->
{
if (aBoolean)
{
@ -72,7 +72,7 @@ public class BanCMD extends PlexCommand
return;
}
String reason;
Punishment punishment = new Punishment(targetUUID, getUUID(sender));
Punishment punishment = new Punishment(plexPlayer.getUuid(), getUUID(sender));
punishment.setType(PunishmentType.BAN);
if (args.length > 1)
{