fix error with sidebars, fixes #1478

DenizenScript · Oct 2, 2016 · fbd13ec · fbd13ec
1 parent 13557fc
commit fbd13ec
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 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
@@ -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
@@ -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
@@ -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