From fbd13ec7e73aa2fd1d7cecc1d1bab89c923aea74 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Sun, 2 Oct 2016 07:38:51 -0700 Subject: [PATCH] fix error with sidebars, fixes #1478 --- .../net/aufdemrand/denizen/nms/impl/Sidebar_v1_10_R1.java | 7 +++++-- .../net/aufdemrand/denizen/nms/impl/Sidebar_v1_8_R3.java | 7 +++++-- .../net/aufdemrand/denizen/nms/impl/Sidebar_v1_9_R2.java | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_10_R1.java b/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_10_R1.java index 4fd214fd70..d54cc75744 100644 --- a/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_10_R1.java +++ b/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_10_R1.java @@ -17,12 +17,15 @@ public Sidebar_v1_10_R1(Player player) { super(player); this.obj1 = new ScoreboardObjective(dummyScoreboard, "dummy_1", dummyCriteria); this.obj2 = new ScoreboardObjective(dummyScoreboard, "dummy_2", dummyCriteria); + setDisplayName(title); } @Override protected void setDisplayName(String title) { - this.obj1.setDisplayName(title); - this.obj2.setDisplayName(title); + if (this.obj1 != null) { + this.obj1.setDisplayName(title); + this.obj2.setDisplayName(title); + } } @Override diff --git a/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_8_R3.java b/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_8_R3.java index b64980af47..6b50ce2c04 100644 --- a/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_8_R3.java +++ b/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_8_R3.java @@ -17,12 +17,15 @@ public Sidebar_v1_8_R3(Player player) { super(player); this.obj1 = new ScoreboardObjective(dummyScoreboard, "dummy_1", dummyCriteria); this.obj2 = new ScoreboardObjective(dummyScoreboard, "dummy_2", dummyCriteria); + setDisplayName(title); } @Override protected void setDisplayName(String title) { - this.obj1.setDisplayName(title); - this.obj2.setDisplayName(title); + if (this.obj1 != null) { + this.obj1.setDisplayName(title); + this.obj2.setDisplayName(title); + } } @Override diff --git a/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_9_R2.java b/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_9_R2.java index 94305f71a2..0811af6fe9 100644 --- a/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_9_R2.java +++ b/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/impl/Sidebar_v1_9_R2.java @@ -17,12 +17,15 @@ public Sidebar_v1_9_R2(Player player) { super(player); this.obj1 = new ScoreboardObjective(dummyScoreboard, "dummy_1", dummyCriteria); this.obj2 = new ScoreboardObjective(dummyScoreboard, "dummy_2", dummyCriteria); + setDisplayName(title); } @Override protected void setDisplayName(String title) { - this.obj1.setDisplayName(title); - this.obj2.setDisplayName(title); + if (this.obj1 != null) { + this.obj1.setDisplayName(title); + this.obj2.setDisplayName(title); + } } @Override