From ba558ea7d14b0f8ac7cf2881d65756661859412f Mon Sep 17 00:00:00 2001 From: Daniil Date: Sun, 5 Aug 2018 13:50:34 +0700 Subject: [PATCH] Fixed plugin synchronization --- .../src/main/java/mc/core/events/EventPipelineTask.java | 2 -- .../main/java/mc/core/events/SharedResourceManager.java | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/event-loop/src/main/java/mc/core/events/EventPipelineTask.java b/event-loop/src/main/java/mc/core/events/EventPipelineTask.java index b2af902..a071f58 100644 --- a/event-loop/src/main/java/mc/core/events/EventPipelineTask.java +++ b/event-loop/src/main/java/mc/core/events/EventPipelineTask.java @@ -71,12 +71,10 @@ public class EventPipelineTask { private LockObserveList getLocks(RegisteredEventHandler handler) { LockObserveList locks = new LockObserveList(); -/* if (handler.isPluginSynchronize()) locks.add(manager.getResourceManager().getPluginLock(handler.getPlugin())); -*/ return locks; } diff --git a/event-loop/src/main/java/mc/core/events/SharedResourceManager.java b/event-loop/src/main/java/mc/core/events/SharedResourceManager.java index 12f6812..45f6e1a 100644 --- a/event-loop/src/main/java/mc/core/events/SharedResourceManager.java +++ b/event-loop/src/main/java/mc/core/events/SharedResourceManager.java @@ -1,17 +1,16 @@ package mc.core.events; import mc.core.events.api.Plugin; +import mc.core.events.lock.PoorMansLock; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; public class SharedResourceManager { - private Map pluginLocks = new ConcurrentHashMap<>(); + private Map pluginLocks = new ConcurrentHashMap<>(); - public Lock getPluginLock(Plugin plugin) { - return pluginLocks.computeIfAbsent(plugin, s -> new ReentrantLock()); + public PoorMansLock getPluginLock(Plugin plugin) { + return pluginLocks.computeIfAbsent(plugin, s -> new PoorMansLock()); } }