ThreadTracker + Attempt on NPC Disappearing fix

Engineered the ThreadTracker: server-embedded deadlock auditing tool, which will print error messages in case of found deadlocks (also showing all in-use locks on the time of the issue).
Changed the player's id on DB now starting from 20mil, thus preventing players from overwriting NPC/mobs with same oid in-game. Requires proper testing to see if the issue has been cleared.

src/client/MapleCharacter.java

@@ -45,7 +45,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Comparator;
-import java.util.concurrent.locks.ReentrantLock;
+import tools.locks.MonitoredReentrantLock;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -154,6 +154,7 @@ import constants.skills.ThunderBreaker;
 import net.server.channel.handlers.PartyOperationHandler;
 import scripting.item.ItemScriptManager;
 import server.maps.MapleMapItem;
+import tools.locks.MonitoredEnums;
 
 public class MapleCharacter extends AbstractAnimatedMapleMapObject {
     private static NumberFormat nf = new DecimalFormat("#,###,###,###");
@@ -270,10 +271,10 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
     private ScheduledFuture<?> extraRecoveryTask = null;
     private ScheduledFuture<?> chairRecoveryTask = null;
     private ScheduledFuture<?> pendantOfSpirit = null; //1122017
-    private Lock chrLock = new ReentrantLock(true);
-    private Lock effLock = new ReentrantLock(true);
-    private Lock petLock = new ReentrantLock(true); // for quest tasks as well
-    private Lock prtLock = new ReentrantLock();
+    private Lock chrLock = new MonitoredReentrantLock(MonitoredEnums.CHR, true);
+    private Lock effLock = new MonitoredReentrantLock(MonitoredEnums.EFF, true);
+    private Lock petLock = new MonitoredReentrantLock(MonitoredEnums.PET, true); // for quest tasks as well
+    private Lock prtLock = new MonitoredReentrantLock(MonitoredEnums.PRT);
     private Map<Integer, Set<Integer>> excluded = new LinkedHashMap<>();
     private Set<Integer> excludedItems = new LinkedHashSet<>();
     private List<MapleRing> crushRings = new ArrayList<>();

src/client/MapleClient.java

@@ -42,7 +42,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import tools.locks.MonitoredReentrantLock;
 
 import javax.script.ScriptEngine;
 
@@ -77,6 +77,7 @@ import tools.FilePrinter;
 import tools.HexTool;
 import tools.MapleAESOFB;
 import tools.MaplePacketCreator;
+import tools.locks.MonitoredEnums;
 
 public class MapleClient {
 
@@ -108,7 +109,7 @@ public class MapleClient {
 	private int picattempt = 0;
 	private byte gender = -1;
 	private boolean disconnecting = false;
-	private final Lock lock = new ReentrantLock(true);
+	private final Lock lock = new MonitoredReentrantLock(MonitoredEnums.CLIENT, true);
 	private int votePoints;
 	private int voteTime = -1;
 	private long lastNpcClick;
@@ -832,7 +833,7 @@ public class MapleClient {
                             
                                 removePlayer();
                                 player.saveCooldowns();
-                                player.saveToDB();
+                                player.saveToDB(true);
                             
 				player = null;
 				return;

src/client/MonsterBook.java

@@ -31,16 +31,17 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import tools.locks.MonitoredReentrantLock;
 import tools.DatabaseConnection;
 import tools.MaplePacketCreator;
+import tools.locks.MonitoredEnums;
 
 public final class MonsterBook {
     private int specialCard = 0;
     private int normalCard = 0;
     private int bookLevel = 1;
     private Map<Integer, Integer> cards = new LinkedHashMap<>();
-    private Lock lock = new ReentrantLock();
+    private Lock lock = new MonitoredReentrantLock(MonitoredEnums.BOOK);
 
     private Set<Entry<Integer, Integer>> getCardSet() {
         lock.lock();

src/client/command/Commands.java

@@ -346,7 +346,7 @@ public class Commands {
                     
 		case "time":
 			DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
-			dateFormat.setTimeZone(TimeZone.getTimeZone("-GMT3"));
+			dateFormat.setTimeZone(TimeZone.getTimeZone(ServerConstants.TIMEZONE));
 			player.yellowMessage("Solaxia Server Time: " + dateFormat.format(new Date()));
 			break;
                     
@@ -741,7 +741,7 @@ public class Commands {
 			player.yellowMessage("Players on this map:");
 			for (MapleMapObject mmo : player.getMap().getPlayers()) {
 				MapleCharacter chr = (MapleCharacter) mmo;
-				player.dropMessage(5, ">> " + chr.getName());
+				player.dropMessage(5, ">> " + chr.getName() + " - " + chr.getId() + " - Oid: " + chr.getObjectId());
 			}
 			player.yellowMessage("NPCs on this map:");
 			for (MapleMapObject npcs : player.getMap().getMapObjects()) {
@@ -755,7 +755,7 @@ public class Commands {
 				if (mobs instanceof MapleMonster) {
 					MapleMonster mob = (MapleMonster) mobs;
 					if(mob.isAlive()){
-						player.dropMessage(5, ">> " + mob.getName() + " - " + mob.getId());
+						player.dropMessage(5, ">> " + mob.getName() + " - " + mob.getId() + " - Oid: " + mob.getObjectId());
 					}
 				}
 			}

src/client/inventory/ItemFactory.java

@@ -27,9 +27,11 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.Lock;
+import tools.locks.MonitoredReentrantLock;
 import tools.DatabaseConnection;
 import tools.Pair;
+import tools.locks.MonitoredEnums;
 
 /**
  *
@@ -45,7 +47,7 @@ public enum ItemFactory {
     MERCHANT(6, false);
     private final int value;
     private final boolean account;
-    private static final ReentrantLock lock = new ReentrantLock(true);
+    private static final Lock lock = new MonitoredReentrantLock(MonitoredEnums.ITEM, true);
 
     private ItemFactory(int value, boolean account) {
         this.value = value;

src/client/inventory/MapleInventory.java

@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Map;
 import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import tools.locks.MonitoredReentrantLock;
 
 import tools.Pair;
 import client.MapleCharacter;
@@ -39,6 +39,7 @@ import constants.ItemConstants;
 import server.MapleItemInformationProvider;
 import server.MapleInventoryManipulator;
 import tools.FilePrinter;
+import tools.locks.MonitoredEnums;
 
 /**
  *
@@ -50,7 +51,7 @@ public class MapleInventory implements Iterable<Item> {
     private byte slotLimit;
     private MapleInventoryType type;
     private boolean checked = false;
-    private Lock lock = new ReentrantLock(true);
+    private Lock lock = new MonitoredReentrantLock(MonitoredEnums.INVENTORY, true);
     
     public MapleInventory(MapleCharacter mc, MapleInventoryType type, byte slotLimit) {
         this.owner = mc;