Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-25 18:19:14 +00:00
Code Issues Releases Activity

Fix locking

Browse Source
This commit is contained in:
Daniel Mills
2020-08-03 10:44:39 -04:00
parent 58a5aaed30
commit ef5115b76c
11 changed files with 93 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/volmit/iris/Iris.java
View File

@@ -36,6 +36,7 @@ import com.volmit.iris.util.Desc;
import com.volmit.iris.util.Form;
import com.volmit.iris.util.GroupedExecutor;
import com.volmit.iris.util.IO;
import com.volmit.iris.util.IrisLock;
import com.volmit.iris.util.IrisPostBlockFilter;
import com.volmit.iris.util.J;
import com.volmit.iris.util.JSONException;
@@ -64,6 +65,7 @@ public class Iris extends MortarPlugin implements BoardProvider
private KList<String> lines = new KList<>();
public RollingSequence hits = new RollingSequence(20);
public RollingSequence tp = new RollingSequence(100);
private static IrisLock lock = new IrisLock("Iris");
public static KList<Class<? extends IrisPostBlockFilter>> postProcessors;
@Permission
@@ -97,6 +99,7 @@ public class Iris extends MortarPlugin implements BoardProvider
public void onEnable()
{
lock = new IrisLock("Iris");
instance = this;
hotloader = new IrisHotloadManager();
data = new IrisDataManager(getDataFolder());
@@ -122,6 +125,7 @@ public class Iris extends MortarPlugin implements BoardProvider
public void onDisable()
{
lock.unlock();
proj.close();
for(GroupedExecutor i : executors)
@@ -280,16 +284,18 @@ public class Iris extends MortarPlugin implements BoardProvider
public static void msg(String string)
{
lock.lock();
String msg = ChatColor.GREEN + "[Iris]: " + ChatColor.GRAY + string;
if(last.equals(msg))
{
lock.unlock();
return;
}
last = msg;
Bukkit.getConsoleSender().sendMessage(msg);
Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () -> Bukkit.getConsoleSender().sendMessage(msg));
lock.unlock();
}
public static void warn(String string)