Prevent exceptions by performing bossbar progress range validation

See: https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/767f028054b0fa7aaa063e2c0c2600b9556bdaff
SimpleMC · Apr 23, 2016 · 6748bd7 · 6748bd7
1 parent eaa4930
commit 6748bd7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
diff --git a/src/main/java/org/simplemc/simpleannounce/SimpleAnnounce.java b/src/main/java/org/simplemc/simpleannounce/SimpleAnnounce.java
@@ -1,7 +1,6 @@
 package org.simplemc.simpleannounce;
 
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;

diff --git a/src/main/java/org/simplemc/simpleannounce/message/sender/BossBarSender.java b/src/main/java/org/simplemc/simpleannounce/message/sender/BossBarSender.java
@@ -64,15 +64,30 @@ public void run()
                 .forEach(bossBar::addPlayer);
 
         // show the boss bar
-        bossBar.show();
+        bossBar.setVisible(true);
 
         // animate
         final BukkitTask animationTask;
         if (animate)
         {
             animationTask = Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () ->
-                            bossBar.setProgress(bossBar.getProgress() + ((reverse ? -1 : 1) * (1.0 / holdTime)))
-                    , 0, 1L);
+            {
+                // calculate next progress bar step
+                double progress = bossBar.getProgress() + ((reverse ? -1 : 1) * (1.0 / holdTime));
+
+                // validate progress bar range
+                if (progress < 0)
+                {
+                    progress = 0;
+                }
+                else if (progress > 1)
+                {
+                    progress = 1;
+                }
+
+                // set progress
+                bossBar.setProgress(progress);
+            }, 0, 1L);
         }
         else
         {

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: SimpleAnnounce
 main: org.simplemc.simpleannounce.SimpleAnnounce
-version: 1.9.1
+version: 1.9.2
 website: http://SimpleMC.org/simpleannounce/
 author: Taylor Becker
 permissions: