EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Check null here as well

Browse Source 
Fixes #1664
This commit is contained in:
TfT_02 2014-01-12 10:30:04 +01:00
parent 0332c0f5e0
commit 103bf593f3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ public class ScoreboardManager {
public static void cleanup(ScoreboardWrapper wrapper) { public static void cleanup(ScoreboardWrapper wrapper) {
PLAYER_SCOREBOARDS.remove(wrapper.playerName); PLAYER_SCOREBOARDS.remove(wrapper.playerName);
if (wrapper.revertTask != null) { if (wrapper != null && wrapper.revertTask != null) {
wrapper.revertTask.cancel(); wrapper.revertTask.cancel();
} }
} }
@ -207,7 +207,7 @@ public class ScoreboardManager {
// Selfboards // Selfboards
ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName());
if (wrapper.isSkillScoreboard() && wrapper.targetSkill == skill && wrapper.isBoardShown()) { if (wrapper != null && wrapper.isSkillScoreboard() && wrapper.targetSkill == skill && wrapper.isBoardShown()) {
wrapper.doSidebarUpdateSoon(); wrapper.doSidebarUpdateSoon();
} }
} }
@ -217,7 +217,7 @@ public class ScoreboardManager {
// Selfboards // Selfboards
ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName()); ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.get(player.getName());
if ((wrapper.isCooldownScoreboard() || wrapper.isSkillScoreboard() && wrapper.targetSkill == skill) && wrapper.isBoardShown()) { if (wrapper != null && (wrapper.isCooldownScoreboard() || wrapper.isSkillScoreboard() && wrapper.targetSkill == skill) && wrapper.isBoardShown()) {
wrapper.doSidebarUpdateSoon(); wrapper.doSidebarUpdateSoon();
} }
} }