Quest clock & ThreadTracker & MapleArrowFetcher patches

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.

src/server/maps/MapleGenericPortal.java

@@ -27,7 +27,7 @@ import scripting.portal.PortalScriptManager;
 import server.MaplePortal;
 import tools.MaplePacketCreator;
 import java.util.concurrent.locks.Lock;
-import tools.locks.MonitoredEnums;
+import tools.locks.MonitoredLockType;
 import tools.locks.MonitoredReentrantLock;
 
 public class MapleGenericPortal implements MaplePortal {
@@ -118,7 +118,7 @@ public class MapleGenericPortal implements MaplePortal {
         
         if(scriptName != null) {
             if(scriptLock == null) {
-                scriptLock = new MonitoredReentrantLock(MonitoredEnums.PORTAL, false);
+                scriptLock = new MonitoredReentrantLock(MonitoredLockType.PORTAL, true);
             }
         } else {
             scriptLock = null;

src/server/maps/MapleHiredMerchant.java

@@ -45,7 +45,7 @@ import server.MaplePlayerShopItem;
 import tools.DatabaseConnection;
 import tools.MaplePacketCreator;
 import tools.Pair;
-import tools.locks.MonitoredEnums;
+import tools.locks.MonitoredLockType;
 
 /**
  *
@@ -64,7 +64,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
     private List<SoldItem> sold = new LinkedList<>();
     private AtomicBoolean open = new AtomicBoolean();
     private MapleMap map;
-    private Lock visitorLock = new MonitoredReentrantLock(MonitoredEnums.VISITOR_MERCH, true);
+    private Lock visitorLock = new MonitoredReentrantLock(MonitoredLockType.VISITOR_MERCH, true);
 
     public MapleHiredMerchant(final MapleCharacter owner, int itemId, String desc) {
         this.setPosition(owner.getPosition());

src/server/maps/MapleMap.java

@@ -86,7 +86,7 @@ import tools.FilePrinter;
 import tools.MaplePacketCreator;
 import tools.Pair;
 import tools.Randomizer;
-import tools.locks.MonitoredEnums;
+import tools.locks.MonitoredLockType;
 
 public class MapleMap {
     private static final List<MapleMapObjectType> rangedMapobjectTypes = Arrays.asList(MapleMapObjectType.SHOP, MapleMapObjectType.ITEM, MapleMapObjectType.NPC, MapleMapObjectType.MONSTER, MapleMapObjectType.DOOR, MapleMapObjectType.SUMMON, MapleMapObjectType.REACTOR);
@@ -106,7 +106,7 @@ public class MapleMap {
     private MapleFootholdTree footholds = null;
     private Rectangle mapArea = new Rectangle();
     private int mapid;
-    private AtomicInteger runningOid = new AtomicInteger(100);
+    private AtomicInteger runningOid = new AtomicInteger(1000000001);
     private int returnMapId;
     private int channel, world;
     private byte monsterRate;
@@ -163,11 +163,11 @@ public class MapleMap {
         if (this.monsterRate == 0) {
             this.monsterRate = 1;
         }
-        final ReentrantReadWriteLock chrLock = new MonitoredReentrantReadWriteLock(MonitoredEnums.MAP_CHRS, true);
+        final ReentrantReadWriteLock chrLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MAP_CHRS, true);
         chrRLock = chrLock.readLock();
         chrWLock = chrLock.writeLock();
 
-        final ReentrantReadWriteLock objectLock = new MonitoredReentrantReadWriteLock(MonitoredEnums.MAP_OBJS, true);
+        final ReentrantReadWriteLock objectLock = new MonitoredReentrantReadWriteLock(MonitoredLockType.MAP_OBJS, true);
         objectRLock = objectLock.readLock();
         objectWLock = objectLock.writeLock();
     }
@@ -389,19 +389,20 @@ public class MapleMap {
     }
 
     private int getUsableOID() {
-        if (runningOid.incrementAndGet() >= 20000000) {
-            runningOid.set(1000);
-        }
         objectRLock.lock();
         try {
-            if (mapobjects.containsKey(runningOid.get())) {
-                while (mapobjects.containsKey(runningOid.incrementAndGet()));
-            }
+            Integer curOid;
+            
+            do {
+                if ((curOid = runningOid.incrementAndGet()) < 0) {
+                    runningOid.set(curOid = 1000000001);
+                }
+            } while (mapobjects.containsKey(curOid));
+            
+            return curOid;
         } finally {
             objectRLock.unlock();
         }
-
-        return runningOid.get();
     }
 
     public void removeMapObject(int num) {

src/server/maps/MapleMapFactory.java

@@ -47,7 +47,7 @@ import server.life.MapleMonster;
 import scripting.event.EventInstanceManager;
 import tools.DatabaseConnection;
 import tools.StringUtil;
-import tools.locks.MonitoredEnums;
+import tools.locks.MonitoredLockType;
 
 public class MapleMapFactory {
 
@@ -66,7 +66,7 @@ public class MapleMapFactory {
         this.channel = channel;
         this.event = eim;
         
-        ReentrantReadWriteLock rrwl = new MonitoredReentrantReadWriteLock(MonitoredEnums.MAP_FACTORY);
+        ReentrantReadWriteLock rrwl = new MonitoredReentrantReadWriteLock(MonitoredLockType.MAP_FACTORY);
         this.mapsRLock = rrwl.readLock();
         this.mapsWLock = rrwl.writeLock();
     }

src/server/maps/MapleMapItem.java

@@ -27,7 +27,7 @@ import java.awt.Point;
 import java.util.concurrent.locks.Lock;
 import tools.locks.MonitoredReentrantLock;
 import tools.MaplePacketCreator;
-import tools.locks.MonitoredEnums;
+import tools.locks.MonitoredLockType;
 
 public class MapleMapItem extends AbstractMapleMapObject {
 
@@ -37,7 +37,7 @@ public class MapleMapItem extends AbstractMapleMapObject {
     protected byte type;
     protected boolean pickedUp = false, playerDrop;
     protected long dropTime;
-    private Lock itemLock = new MonitoredReentrantLock(MonitoredEnums.MAP_ITEM);
+    private Lock itemLock = new MonitoredReentrantLock(MonitoredLockType.MAP_ITEM);
 
     public MapleMapItem(Item item, Point position, MapleMapObject dropper, MapleCharacter owner, byte type, boolean playerDrop) {
 	setPosition(position);

src/server/maps/MapleMiniDungeon.java

@@ -27,7 +27,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.locks.Lock;
 import tools.locks.MonitoredReentrantLock;
 import tools.MaplePacketCreator;
-import tools.locks.MonitoredEnums;
+import tools.locks.MonitoredLockType;
 
 /**
  *
@@ -36,7 +36,7 @@ import tools.locks.MonitoredEnums;
 public class MapleMiniDungeon {
     List<MapleCharacter> players = new ArrayList<>();
     ScheduledFuture<?> timeoutTask = null;
-    Lock lock = new MonitoredReentrantLock(MonitoredEnums.MINIDUNGEON, true);
+    Lock lock = new MonitoredReentrantLock(MonitoredLockType.MINIDUNGEON, true);
     
     int baseMap;
     long expireTime;

src/server/maps/MapleReactor.java

@@ -35,7 +35,7 @@ import scripting.reactor.ReactorScriptManager;
 import server.TimerManager;
 import tools.MaplePacketCreator;
 import tools.Pair;
-import tools.locks.MonitoredEnums;
+import tools.locks.MonitoredLockType;
 
 /**
  *
@@ -54,7 +54,7 @@ public class MapleReactor extends AbstractMapleMapObject {
     private boolean shouldCollect;
     private boolean attackHit;
     private ScheduledFuture<?> timeoutTask = null;
-    private Lock reactorLock = new MonitoredReentrantLock(MonitoredEnums.REACTOR, true);
+    private Lock reactorLock = new MonitoredReentrantLock(MonitoredLockType.REACTOR, true);
 
     public MapleReactor(MapleReactorStats stats, int rid) {
         this.evstate = (byte)0;