v1.1.3

Api is now more thread save.

Author: koca2000

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.xxmicloxx</groupId>
     <artifactId>NoteBlockAPI</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <repositories>
         <repository>
             <id>spigot-repo</id>

src/main/java/com/xxmicloxx/NoteBlockAPI/NoteBlockPlayerMain.java

@@ -13,6 +13,8 @@ public class NoteBlockPlayerMain extends JavaPlugin {
     public HashMap<String, ArrayList<SongPlayer>> playingSongs = new HashMap<String, ArrayList<SongPlayer>>();
     public HashMap<String, Byte> playerVolume = new HashMap<String, Byte>();
 
+    public boolean disabling = false;
+    
     public static boolean isReceivingSong(Player p) {
         return ((plugin.playingSongs.get(p.getName()) != null) && (!plugin.playingSongs.get(p.getName()).isEmpty()));
     }
@@ -46,6 +48,7 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
+    	disabling = true;
         Bukkit.getScheduler().cancelTasks(this);
     }
 }

src/main/java/com/xxmicloxx/NoteBlockAPI/SongPlayer.java

@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 public abstract class SongPlayer {
 
@@ -78,12 +79,12 @@ protected void calculateFade() {
     }
 
     protected void createThread() {
-        playerThread = new Thread(new Runnable() {
+    	playerThread = new Thread(new Runnable() {
             @Override
             public void run() {
                 while (!destroyed) {
                     long startTime = System.currentTimeMillis();
-                    synchronized (SongPlayer.this) {
+                    /*synchronized (SongPlayer.this) {
                         if (playing) {
                             calculateFade();
                             tick++;
@@ -107,7 +108,50 @@ public void run() {
                                 playTick(p, tick);
                             }
                         }
+                    }*/
+                    
+                    try {
+                        synchronized (Bukkit.getScheduler()) {
+                        	if (destroyed || NoteBlockPlayerMain.plugin.disabling){
+                            	break;
+                            }
+                            Bukkit.getScheduler().callSyncMethod(NoteBlockPlayerMain.plugin, new Callable<Boolean>() {
+                                public Boolean call() {
+                                	if (playing) {
+                                        calculateFade();
+                                        tick++;
+                                        if (tick > song.getLength()) {
+                                            playing = false;
+                                            tick = -1;
+                                            SongEndEvent event = new SongEndEvent(SongPlayer.this);
+                                            Bukkit.getPluginManager().callEvent(event);
+                                            if (autoDestroy) {
+                                                destroy();
+                                                return false;
+                                            }
+                                        }
+                                        for (String s : playerList) {
+                                            @SuppressWarnings("deprecation")
+            								Player p = Bukkit.getPlayerExact(s);
+                                            if (p == null) {
+                                                // offline...
+                                                continue;
+                                            }
+                                            playTick(p, tick);
+                                        }
+                                    }
+                                    return true;
+                                }
+                            });
+                        }
+                    } catch (java.lang.IllegalStateException e) {
+                        e.printStackTrace();
+                    }
+                    
+                    if (destroyed){
+                    	break;
                     }
+                    
                     long duration = System.currentTimeMillis() - startTime;
                     float delayMillis = song.getDelay() * 50;
                     if (duration < delayMillis) {

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: NoteBlockAPI
 
 main: com.xxmicloxx.NoteBlockAPI.NoteBlockPlayerMain
-version: 1.1.2
+version: 1.1.3
 
 description: a developer interface to play nbs-files ingame
 authors: [xxmicloxx, michidk, koca2000]