Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quest clock & ThreadTracker & MapleArrowFetcher patches

Browse Source 
Fixed quest timer UI not disappearing on the client on quest complete.
Fixed a bug on ThreadTracker, not displaying properly the last acquired lock-type.
Fixed MapleArrowFetcher giving out same values from min and max ranges. Max should always be greater than min. Updated DB drops.
Readjusted player ids now starting from 1 again, and moved field oids to start counting from 1bil.
This commit is contained in:
ronancpl
2017-11-18 11:24:24 -02:00
parent 2b38b62683
commit 71ad2ee3a9
49 changed files with 786 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scripting/event/EventManager.java
View File

@@ -53,7 +53,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.locks.Lock;
import tools.locks.MonitoredEnums;
import tools.locks.MonitoredLockType;
import tools.locks.MonitoredReentrantLock;
/**
@@ -75,8 +75,8 @@ public class EventManager {
private Integer readyId = 0;
private Properties props = new Properties();
private String name;
private Lock lobbyLock = new MonitoredReentrantLock(MonitoredEnums.EM_LOBBY);
private Lock queueLock = new MonitoredReentrantLock(MonitoredEnums.EM_QUEUE);
private Lock lobbyLock = new MonitoredReentrantLock(MonitoredLockType.EM_LOBBY);
private Lock queueLock = new MonitoredReentrantLock(MonitoredLockType.EM_QUEUE);
private static final int maxLobbys = 8; // an event manager holds up to this amount of concurrent lobbys