Aran skill & mount quests + New player IDs + MapleSkillMakerFetcher

Aran skill and mount questlines fixed.
Player ID starts counting from 20mil now, preventing clashes with map objects oid's (trying to solve the NPC disappearing issue).
New tool: MapleSkillMakerFetcher. It compiles a SQL script file containing updated Maker data info from the inputted ItemMake.wz.xml.
Updated Maker tables on the DB.

src/server/MakerItemFactory.java

@@ -112,7 +112,7 @@ public class MakerItemFactory {
         }
 
         protected void addReqItem(int itemId, int amount) {
-            reqItems.add(new Pair<Integer, Integer>(itemId, amount));
+            reqItems.add(new Pair<>(itemId, amount));
         }
     }
 }

src/server/MapleTrade.java

@@ -75,7 +75,7 @@ public class MapleTrade {
         return fee;
     }
 
-    private void lock() {
+    private void lockTrade() {
         locked.set(true);
         partner.getChr().getClient().announce(MaplePacketCreator.getTradeConfirmation());
     }
@@ -201,7 +201,7 @@ public class MapleTrade {
     }
 
     public static void completeTrade(MapleCharacter c) {
-        c.getTrade().lock();
+        c.getTrade().lockTrade();
         MapleTrade local = c.getTrade();
         MapleTrade partner = local.getPartner();
         if (partner.isLocked()) {

src/server/maps/MapleMap.java

@@ -387,7 +387,7 @@ public class MapleMap {
     }
 
     private int getUsableOID() {
-        if (runningOid.incrementAndGet() > 2000000000) {
+        if (runningOid.incrementAndGet() >= 20000000) {
             runningOid.set(1000);
         }
         objectRLock.lock();
@@ -865,6 +865,8 @@ public class MapleMap {
                 if (!monster.isAlive()) {
                     return false;
                 }
+                
+                /* pyramid not implemented
                 Pair<Integer, Integer> cool = monster.getStats().getCool();
                 if (cool != null) {
                     Pyramid pq = (Pyramid) chr.getPartyQuest();
@@ -885,6 +887,8 @@ public class MapleMap {
                         killed = true;
                     }
                 }
+                */
+                
                 if (damage > 0) {
                     monster.damage(chr, damage);
                     if (!monster.isAlive()) {  // monster just died
@@ -1070,9 +1074,7 @@ public class MapleMap {
     }
 
     public void softKillAllMonsters() {
-        for (SpawnPoint spawnPoint : monsterSpawn) {
-            spawnPoint.setDenySpawn(true);
-        }
+        closeMapSpawnPoints();
         
         for (MapleMapObject monstermo : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER))) {
             MapleMonster monster = (MapleMonster) monstermo;
@@ -1086,9 +1088,7 @@ public class MapleMap {
     }
 
     public void killAllMonstersNotFriendly() {
-        for (SpawnPoint spawnPoint : monsterSpawn) {
-            spawnPoint.setDenySpawn(true);
-        }
+        closeMapSpawnPoints();
         
         for (MapleMapObject monstermo : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER))) {
             MapleMonster monster = (MapleMonster) monstermo;
@@ -1101,9 +1101,7 @@ public class MapleMap {
     }
 
     public void killAllMonsters() {
-        for (SpawnPoint spawnPoint : monsterSpawn) {
-            spawnPoint.setDenySpawn(true);
-        }
+        closeMapSpawnPoints();
         
         for (MapleMapObject monstermo : getMapObjectsInRange(new Point(0, 0), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER))) {
             MapleMonster monster = (MapleMonster) monstermo;
@@ -2834,6 +2832,12 @@ public class MapleMap {
         }
     }
     
+    public void closeMapSpawnPoints() {
+        for (SpawnPoint spawnPoint : monsterSpawn) {
+            spawnPoint.setDenySpawn(true);
+        }
+    }
+    
     public void restoreMapSpawnPoints() {
         for (SpawnPoint spawnPoint : monsterSpawn) {
             spawnPoint.setDenySpawn(false);