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

Fix exception messages displaying twice

Browse Source
This commit is contained in:
Telesphoreo 2022-01-27 15:22:28 -06:00
parent 15f0f5fe2d
commit e0b98794c5
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
package dev.plex.command; package dev.plex.command;
import com.google.common.collect.ImmutableList;
import dev.plex.Plex; import dev.plex.Plex;
import dev.plex.cache.DataUtils; import dev.plex.cache.DataUtils;
import dev.plex.cache.PlayerCache; import dev.plex.cache.PlayerCache;
@ -15,20 +14,21 @@ import dev.plex.command.source.RequiredCommandSource;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import java.util.Arrays;
import java.util.UUID;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.*; import org.bukkit.command.Command;
import org.bukkit.command.CommandMap;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
public abstract class PlexCommand extends Command public abstract class PlexCommand extends Command
{ {
protected static Plex plugin = Plex.get(); protected static Plex plugin = Plex.get();
@ -103,18 +103,11 @@ public abstract class PlexCommand extends Command
{ {
send(sender, getUsage().replace("<command>", getLabel())); send(sender, getUsage().replace("<command>", getLabel()));
} }
catch (PlayerNotFoundException | CommandFailException ex) catch (PlayerNotFoundException | CommandFailException
| ConsoleOnlyException | ConsoleMustDefinePlayerException ex)
{ {
send(sender, ex.getMessage()); send(sender, ex.getMessage());
} }
catch (ConsoleMustDefinePlayerException ex)
{
send(sender, tl("consoleMustDefinePlayer"));
}
catch (ConsoleOnlyException ex)
{
send(sender, tl("consoleOnly"));
}
return true; return true;
} }
@ -161,7 +154,10 @@ public abstract class PlexCommand extends Command
protected boolean isAdmin(CommandSender sender) protected boolean isAdmin(CommandSender sender)
{ {
if (!(sender instanceof Player player)) return true; if (!(sender instanceof Player player))
{
return true;
}
PlexPlayer plexPlayer = getPlexPlayer(player); PlexPlayer plexPlayer = getPlexPlayer(player);
return Plex.get().getRankManager().isAdmin(plexPlayer); return Plex.get().getRankManager().isAdmin(plexPlayer);
} }
@ -174,14 +170,20 @@ public abstract class PlexCommand extends Command
protected boolean isSeniorAdmin(CommandSender sender) protected boolean isSeniorAdmin(CommandSender sender)
{ {
if (!(sender instanceof Player player)) return true; if (!(sender instanceof Player player))
{
return true;
}
PlexPlayer plexPlayer = getPlexPlayer(player); PlexPlayer plexPlayer = getPlexPlayer(player);
return Plex.get().getRankManager().isSeniorAdmin(plexPlayer); return Plex.get().getRankManager().isSeniorAdmin(plexPlayer);
} }
protected UUID getUUID(CommandSender sender) protected UUID getUUID(CommandSender sender)
{ {
if (!(sender instanceof Player player)) return null; if (!(sender instanceof Player player))
{
return null;
}
return player.getUniqueId(); return player.getUniqueId();
} }

3
src/main/java/dev/plex/rank/DefaultRankObj.java
View File

@ -2,9 +2,8 @@ package dev.plex.rank;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import lombok.Getter;
import java.util.List; import java.util.List;
import lombok.Getter;
@Getter @Getter
public class DefaultRankObj public class DefaultRankObj

5
src/main/java/dev/plex/world/BlockMapChunkGenerator.java
View File

@ -1,10 +1,9 @@
package dev.plex.world; package dev.plex.world;
import org.bukkit.Material;
import org.bukkit.generator.BlockPopulator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.bukkit.Material;
import org.bukkit.generator.BlockPopulator;
public class BlockMapChunkGenerator extends FlatChunkGenerator public class BlockMapChunkGenerator extends FlatChunkGenerator
{ {