Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2024-12-23 01:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

this codebase is a mess

Browse Source
This commit is contained in:
Telesphoreo 2022-02-05 14:43:49 -06:00
parent eebb34cd1c
commit d8a8f33425
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dev/plex/command/PlexCommand.java
View File

@ -95,16 +95,14 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
{ {
if (!plexPlayer.getRankFromString().isAtLeast(getLevel())) if (!plexPlayer.getRankFromString().isAtLeast(getLevel()))
{ {
send(sender, tl("noPermissionRank", ChatColor.stripColor(getLevel().getLoginMSG()))); throw new CommandFailException(PlexUtils.tl("noPermissionRank", ChatColor.stripColor(getLevel().getLoginMSG())));
return true;
} }
} }
else if (plugin.getSystem().equalsIgnoreCase("permissions")) else if (plugin.getSystem().equalsIgnoreCase("permissions"))
{ {
if (!player.hasPermission(perms.permission())) if (!player.hasPermission(perms.permission()))
{ {
send(sender, tl("noPermissionNode", perms.permission())); throw new CommandFailException(PlexUtils.tl("noPermissionNode", perms.permission()));
return true;
} }
} }
else else

2
src/main/java/dev/plex/command/impl/FreezeCMD.java
View File

@ -37,7 +37,7 @@ public class FreezeCMD extends PlexCommand
Punishment punishment = new Punishment(UUID.fromString(punishedPlayer.getUuid()), getUUID(sender)); Punishment punishment = new Punishment(UUID.fromString(punishedPlayer.getUuid()), getUUID(sender));
punishment.setCustomTime(false); punishment.setCustomTime(false);
Date date = new Date(); Date date = new Date();
punishment.setEndDate(DateUtils.addDays(date, 1)); punishment.setEndDate(DateUtils.addMinutes(date, 5));
punishment.setType(PunishmentType.FREEZE); punishment.setType(PunishmentType.FREEZE);
punishment.setPunishedUsername(player.getName()); punishment.setPunishedUsername(player.getName());
punishment.setReason(""); punishment.setReason("");

7
src/main/java/dev/plex/command/impl/RankCMD.java
View File

@ -21,8 +21,11 @@ public class RankCMD extends PlexCommand
@Override @Override
protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args) protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
{ {
PlexPlayer plexPlayer = getPlexPlayer(playerSender); if (!(playerSender == null))
Rank rank = plugin.getRankManager().getRankFromString(plexPlayer.getRank()); {
Rank rank = getPlexPlayer(playerSender).getRankFromString();
return tl("yourRank", rank.getReadableString()); return tl("yourRank", rank.getReadableString());
} }
return null;
}
} }

2
src/main/java/dev/plex/listener/impl/FreezeListener.java
View File

@ -1,9 +1,11 @@
package dev.plex.listener.impl; package dev.plex.listener.impl;
import dev.plex.cache.DataUtils;
import dev.plex.cache.PlayerCache; import dev.plex.cache.PlayerCache;
import dev.plex.listener.PlexListener; import dev.plex.listener.PlexListener;
import dev.plex.player.PunishedPlayer; import dev.plex.player.PunishedPlayer;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
public class FreezeListener extends PlexListener public class FreezeListener extends PlexListener

2
src/main/java/dev/plex/listener/impl/PlayerListener.java
View File

@ -8,6 +8,7 @@ import dev.plex.cache.SQLPlayerData;
import dev.plex.listener.PlexListener; import dev.plex.listener.PlexListener;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import dev.plex.player.PunishedPlayer; import dev.plex.player.PunishedPlayer;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexLog; import dev.plex.util.PlexLog;
import java.util.Collections; import java.util.Collections;
import java.util.UUID; import java.util.UUID;
@ -49,7 +50,6 @@ public class PlayerListener extends PlexListener
plexPlayer = new PlexPlayer(player.getUniqueId()); //it doesn't! okay so now create the object plexPlayer = new PlexPlayer(player.getUniqueId()); //it doesn't! okay so now create the object
plexPlayer.setName(player.getName()); //set the name of the player plexPlayer.setName(player.getName()); //set the name of the player
plexPlayer.setIps(Collections.singletonList(player.getAddress().getAddress().getHostAddress().trim())); //set the arraylist of ips plexPlayer.setIps(Collections.singletonList(player.getAddress().getAddress().getHostAddress().trim())); //set the arraylist of ips
DataUtils.insert(plexPlayer); // insert data in some wack db DataUtils.insert(plexPlayer); // insert data in some wack db
} }
else else