From 92e2769c55380afb2413e0a382b422687c2d8a9a Mon Sep 17 00:00:00 2001 From: Fabrizio La Rosa Date: Fri, 7 Aug 2020 18:17:27 +0200 Subject: [PATCH] Fixed npe in scoreboard manager --- .../songoda/skyblock/scoreboard/Holder.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/songoda/skyblock/scoreboard/Holder.java b/src/main/java/com/songoda/skyblock/scoreboard/Holder.java index ce42e19b..1687009e 100644 --- a/src/main/java/com/songoda/skyblock/scoreboard/Holder.java +++ b/src/main/java/com/songoda/skyblock/scoreboard/Holder.java @@ -26,19 +26,21 @@ class Holder { PlaceholderManager placeholderManager = plugin.getPlaceholderManager(); ScoreboardManager scoreboardManager = plugin.getScoreboardManager(); - if (!scoreboardManager.isPlayerDisabled(player)) { - board.setTitle(driver.getTitle().getLine()); - - int count = 0; - for(Row row : driver.getRows()) { - String line = placeholderManager.parsePlaceholders(player, row.getLine()); - board.setLine(count, line); - count++; + if(scoreboardManager != null) { + if (!scoreboardManager.isPlayerDisabled(player)) { + board.setTitle(driver.getTitle().getLine()); + + int count = 0; + for(Row row : driver.getRows()) { + String line = placeholderManager.parsePlaceholders(player, row.getLine()); + board.setLine(count, line); + count++; + } + + this.player.setScoreboard(board.getBoard()); + } else { + this.player.setScoreboard(scoreboardManager.getEmptyScoreboard()); } - - this.player.setScoreboard(board.getBoard()); - } else { - this.player.setScoreboard(scoreboardManager.getEmptyScoreboard()); } }