Edited Thread saving. (v1.1.16)

Thanks to Luck's fork.

Author: koca2000

pom.xml

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

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

@@ -5,7 +5,7 @@
 public class Instrument {
 
     public static Sound getInstrument(byte instrument) {
-    	if (!NoteBlockPlayerMain.plugin.isPre1_9()){
+    	if (!NoteBlockPlayerMain.isPre1_9()){
 	    	switch (instrument) {
 	            case 0:
 	                return Sound.valueOf("BLOCK_NOTE_HARP");

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

@@ -1,19 +1,22 @@
 package com.xxmicloxx.NoteBlockAPI;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 public class NoteBlockPlayerMain extends JavaPlugin {
 
     public static NoteBlockPlayerMain plugin;
-    public HashMap<String, ArrayList<SongPlayer>> playingSongs = new HashMap<String, ArrayList<SongPlayer>>();
-    public HashMap<String, Byte> playerVolume = new HashMap<String, Byte>();
+    
+    public Map<String, ArrayList<SongPlayer>> playingSongs = Collections.synchronizedMap(new HashMap<String, ArrayList<SongPlayer>>());
+    public Map<String, Byte> playerVolume = Collections.synchronizedMap(new HashMap<String, Byte>());
 
-    public boolean disabling = false;
+    private boolean disabling = false;
 
     public static boolean isReceivingSong(Player p) {
         return ((plugin.playingSongs.get(p.getName()) != null) && (!plugin.playingSongs.get(p.getName()).isEmpty()));
@@ -47,20 +50,24 @@ public void onEnable() {
     }
 
     @Override
-    public void onDisable() {
+    public void onDisable() {    	
     	disabling = true;
         Bukkit.getScheduler().cancelTasks(this);
     }
 
-    public boolean isPre1_9(){
-    	if (Bukkit.getVersion().contains("1.8")) {
-    		   return true;
-    	}
-    	
-    	if (Bukkit.getVersion().contains("1.7")) {
- 		   return true;
-    	}
-    	
-		return false;
+    public static boolean isPre1_9(){
+    	return Bukkit.getVersion().contains("1.8") || Bukkit.getVersion().contains("1.7");
+    }
+    
+    public void doSync(Runnable r) {
+        getServer().getScheduler().runTask(this, r);
+    }
+
+    public void doAsync(Runnable r) {
+        getServer().getScheduler().runTaskAsynchronously(this, r);
+    }
+    
+    protected boolean isDisabling(){
+    	return disabling;
     }
 }

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

@@ -41,7 +41,7 @@ private NotePitch(int note, float pitchPre1_9, float pitchPost1_9) {
     public static float getPitch(int note) {
         for (NotePitch notePitch : values()) {
             if (notePitch.note == note) {
-                return NoteBlockPlayerMain.plugin.isPre1_9() ? notePitch.pitchPre1_9 : notePitch.pitchPost1_9;
+                return NoteBlockPlayerMain.isPre1_9() ? notePitch.pitchPre1_9 : notePitch.pitchPost1_9;
             }
         }
 

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

@@ -4,7 +4,9 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.Callable;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -14,8 +16,7 @@ public abstract class SongPlayer {
     protected Song song;
     protected boolean playing = false;
     protected short tick = -1;
-    //protected ArrayList<String> playerList = new ArrayList<String>();
-    protected HashMap<String, Boolean> playerList = new HashMap<String, Boolean>();
+    protected Map<String, Boolean> playerList = Collections.synchronizedMap(new HashMap<String, Boolean>());
     protected boolean autoDestroy = false;
     protected boolean destroyed = false;
     protected Thread playerThread;
@@ -25,10 +26,13 @@ public abstract class SongPlayer {
     protected int fadeDuration = 60;
     protected int fadeDone = 0;
     protected FadeType fadeType = FadeType.FADE_LINEAR;
-
+    private final Lock lock = new ReentrantLock();
+    protected NoteBlockPlayerMain plugin;
+    
     public SongPlayer(Song song) {
         this.song = song;
-        createThread();
+        plugin = NoteBlockPlayerMain.plugin;
+        start();
     }
 
     public FadeType getFadeType() {
@@ -80,94 +84,63 @@ protected void calculateFade() {
         fadeDone++;
     }
 
-    protected void createThread() {
-    	playerThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                while (!destroyed) {
-                    long startTime = System.currentTimeMillis();
-                    /*synchronized (SongPlayer.this) {
-                        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;
-                                }
-                            }
-                            for (String s : playerList) {
-                                @SuppressWarnings("deprecation")
-								Player p = Bukkit.getPlayerExact(s);
-                                if (p == null) {
-                                    // offline...
-                                    continue;
-                                }
-                                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.keySet()) {
-                                            @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){
+    @SuppressWarnings("deprecation")
+	private void start() {
+    	plugin.doAsync(() -> {
+            while (!destroyed) {
+                long startTime = System.currentTimeMillis();
+                lock.lock();
+                try {
+                	if (destroyed || NoteBlockPlayerMain.plugin.isDisabling()){
                     	break;
                     }
-                    
-                    long duration = System.currentTimeMillis() - startTime;
-                    float delayMillis = song.getDelay() * 50;
-                    if (duration < delayMillis) {
-                        try {
-                            Thread.sleep((long) (delayMillis - duration));
-                        } catch (InterruptedException e) {
-                            // do nothing
+                	
+                    if (playing) {
+                        calculateFade();
+                        tick++;
+                        if (tick > song.getLength()) {
+                            playing = false;
+                            tick = -1;
+                            SongEndEvent event = new SongEndEvent(SongPlayer.this);
+                            plugin.doSync(() -> Bukkit.getPluginManager().callEvent(event));
+                            if (autoDestroy) {
+                                destroy();
+                            }
+                            return;
                         }
+                        
+                        plugin.doSync(() -> {
+	                        for (String s : playerList.keySet()) {
+	                            Player p = Bukkit.getPlayerExact(s);
+	                            if (p == null) {
+	                                // offline...
+	                                continue;
+	                            }
+	                            playTick(p, tick);
+	                        }
+                        });
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                    lock.unlock();
+                }
+                
+                if (destroyed){
+                	break;
+                }
+                
+                long duration = System.currentTimeMillis() - startTime;
+                float delayMillis = song.getDelay() * 50;
+                if (duration < delayMillis) {
+                    try {
+                        Thread.sleep((long) (delayMillis - duration));
+                    } catch (InterruptedException e) {
+                        // do nothing
                     }
                 }
             }
         });
-        playerThread.setPriority(Thread.MAX_PRIORITY);
-        playerThread.start();
     }
 
     public List<String> getPlayerList() {
@@ -177,7 +150,8 @@ public List<String> getPlayerList() {
     }
 
     public void addPlayer(Player p) {
-        synchronized (this) {
+       lock.lock();
+       try{
             if (!playerList.containsKey(p.getName())) {
                 playerList.put(p.getName(), false);
                 ArrayList<SongPlayer> songs = NoteBlockPlayerMain.plugin.playingSongs
@@ -188,27 +162,36 @@ public void addPlayer(Player p) {
                 songs.add(this);
                 NoteBlockPlayerMain.plugin.playingSongs.put(p.getName(), songs);
             }
-        }
+        } finally {
+			lock.unlock();
+		}
     }
 
 
 
     public boolean getAutoDestroy() {
-        synchronized (this) {
+        lock.lock();
+        try {
             return autoDestroy;
-        }
+        } finally {
+			lock.unlock();
+		}
     }
 
     public void setAutoDestroy(boolean value) {
-        synchronized (this) {
+    	lock.lock();
+        try {
             autoDestroy = value;
-        }
+        } finally {
+			lock.unlock();
+		}
     }
 
     public abstract void playTick(Player p, int tick);
 
     public void destroy() {
-        synchronized (this) {
+    	lock.lock();
+        try {
             SongDestroyingEvent event = new SongDestroyingEvent(this);
             Bukkit.getPluginManager().callEvent(event);
             //Bukkit.getScheduler().cancelTask(threadId);
@@ -218,7 +201,9 @@ public void destroy() {
             destroyed = true;
             playing = false;
             setTick((short) -1);
-        }
+        } finally {
+			lock.unlock();
+		}
     }
 
     public boolean isPlaying() {
@@ -238,11 +223,12 @@ public short getTick() {
     }
 
     public void setTick(short tick) {
-        this.tick = tick;
+    	this.tick = tick;
     }
 
     public void removePlayer(Player p) {
-        synchronized (this) {
+    	lock.lock();
+        try {
             playerList.remove(p.getName());
             if (NoteBlockPlayerMain.plugin.playingSongs.get(p.getName()) == null) {
                 return;
@@ -256,7 +242,9 @@ public void removePlayer(Player p) {
                 Bukkit.getPluginManager().callEvent(event);
                 destroy();
             }
-        }
+        } finally {
+			lock.unlock();
+		}
     }
 
     public byte getVolume() {

src/main/resources/plugin.yml

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