EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Fix ScoreboardManager NPE and added locale messages relating to scoreboards

Browse Source
This commit is contained in:
nossr50
2021-12-27 10:46:56 -08:00
parent 61388f46f1
commit ddc9a69f4b
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
View File

@ -23,6 +23,16 @@ public class McscoreboardCommand implements TabExecutor {
return true;
}
if(!mcMMO.p.getGeneralConfig().getScoreboardsEnabled()) {
sender.sendMessage(LocaleLoader.getString("Scoreboard.Disabled"));
return true;
}
if(!ScoreboardManager.isPlayerBoardSetup(sender.getName())) {
sender.sendMessage(LocaleLoader.getString("Scoreboard.NotSetupYet"));
return true;
}
switch (args.length) {
case 1:
if (args[0].equalsIgnoreCase("clear") || args[0].equalsIgnoreCase("reset")) {

4
src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java
View File

@ -574,6 +574,10 @@ public class ScoreboardManager {
PLAYER_SCOREBOARDS.get(playerName).showBoardAndScheduleRevert(seconds * Misc.TICK_CONVERSION_FACTOR);
}
public static boolean isPlayerBoardSetup(@NotNull String playerName) {
return PLAYER_SCOREBOARDS.get(playerName) != null;
}
public static @Nullable ScoreboardWrapper makeNewScoreboard(Player player) {
if(getScoreboardManager() == null)
return null;