Optimize for explorer loading

com/gamingmesh/jobs/Jobs.java

@@ -737,7 +737,7 @@ public class Jobs extends JavaPlugin {
 	    // all loaded properly.
 
 	    dao.loadBlockProtection();
-	    dao.loadExplore();
+	    getExplore().load();
 
 	    String message = ChatColor.translateAlternateColorCodes('&', "&e[Jobs] Plugin has been enabled succesfully.");
 	    ConsoleCommandSender console = Bukkit.getServer().getConsoleSender();

com/gamingmesh/jobs/PlayerManager.java

@@ -97,18 +97,26 @@ public class PlayerManager {
 
     public void addPlayerToCache(JobsPlayer jPlayer) {
 	if (jPlayer.getUserName() != null)
-	    this.playersCache.put(jPlayer.getUserName(), jPlayer);
+	    this.playersCache.put(jPlayer.getUserName().toLowerCase(), jPlayer);
 	if (jPlayer.getPlayerUUID() != null)
 	    this.playersUUIDCache.put(jPlayer.getPlayerUUID(), jPlayer);
     }
 
     public void addPlayer(JobsPlayer jPlayer) {
 	if (jPlayer.getUserName() != null)
-	    this.players.put(jPlayer.getUserName(), jPlayer);
+	    this.players.put(jPlayer.getUserName().toLowerCase(), jPlayer);
 	if (jPlayer.getPlayerUUID() != null)
 	    this.playersUUID.put(jPlayer.getPlayerUUID(), jPlayer);
     }
 
+    public JobsPlayer removePlayer(Player player) {
+	if (player == null)
+	    return null;
+	this.players.remove(player.getName().toLowerCase());
+	JobsPlayer jPlayer = this.playersUUID.remove(player.getUniqueId());
+	return jPlayer;
+    }
+
     public ConcurrentHashMap<UUID, JobsPlayer> getPlayersCache() {
 	return this.playersUUIDCache;
     }
@@ -148,14 +156,13 @@ public class PlayerManager {
      * @param playername
      */
     public void playerJoin(Player player) {
-	JobsPlayer jPlayer = this.playersCache.get(player.getName().toLowerCase());
+	JobsPlayer jPlayer = this.playersUUIDCache.get(player.getUniqueId());
 	if (jPlayer == null || Jobs.getGCManager().MultiServerCompatability()) {
 	    jPlayer = Jobs.getJobsDAO().loadFromDao(player);
 	    jPlayer.loadLogFromDao();
-	    this.playersCache.put(player.getName().toLowerCase(), jPlayer);
 	}
 
-	this.players.put(player.getName().toLowerCase(), jPlayer);
+	this.addPlayer(jPlayer);
 	jPlayer.setPlayer(player);
 	AutoJoinJobs(player);
 	jPlayer.onConnect();
@@ -169,12 +176,12 @@ public class PlayerManager {
      * @param playername
      */
     public void playerQuit(Player player) {
-	JobsPlayer jPlayer = this.players.remove(player.getName().toLowerCase());
+	JobsPlayer jPlayer = this.removePlayer(player);
 	if (jPlayer == null)
 	    jPlayer = Jobs.getPlayerManager().getJobsPlayer(player);
 	if (jPlayer == null)
 	    return;
-	playersCache.put(player.getName().toLowerCase(), jPlayer);
+	addPlayerToCache(jPlayer);
 	if (Jobs.getGCManager().saveOnDisconnect()) {
 	    jPlayer.save();
 	    jPlayer.onDisconnect();

com/gamingmesh/jobs/config/.gitignore

@@ -31,3 +31,4 @@
 /BossBarManager.class
 /BlockProtectionManager.class
 /ScheduleManager$3.class
+/ExploreManager$1.class

com/gamingmesh/jobs/config/ExploreManager.java

@@ -2,6 +2,8 @@ package com.gamingmesh.jobs.config;
 
 import java.util.HashMap;
 
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
 import org.bukkit.entity.Player;
 
@@ -16,9 +18,6 @@ public class ExploreManager {
     private boolean exploreEnabled = false;
     private int playerAmount = 1;
 
-    public ExploreManager() {
-    }
-
     public int getPlayerAmount() {
 	return this.playerAmount;
     }
@@ -35,10 +34,17 @@ public class ExploreManager {
     public void setExploreEnabled() {
 	if (!exploreEnabled) {
 	    this.exploreEnabled = true;
-	    Jobs.getJobsDAO().loadExplore();
 	}
     }
 
+    public void load() {
+	if (!exploreEnabled)
+	    return;
+	Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "[Jobs] Loading explorer data");
+	Jobs.getJobsDAO().loadExplore();
+	Bukkit.getConsoleSender().sendMessage(ChatColor.YELLOW + "[Jobs] Loaded explorer data");
+    }
+
     public HashMap<String, ExploreRegion> getWorlds() {
 	return worlds;
     }
@@ -65,17 +71,7 @@ public class ExploreManager {
 	    return new ExploreRespond(eChunk.getCount(), true);
 	}
 	ExploreRegion eRegion = worlds.get(worldName);
-	ExploreChunk eChunk = null;
+	ExploreChunk eChunk = eRegion.getChunk(ChunkX + ":" + ChunkZ);
-	for (ExploreChunk one : eRegion.getChunks()) {
-	    if (one.getX() != ChunkX)
-		continue;
-	    if (one.getZ() != ChunkZ)
-		continue;
-	    eChunk = one;
-	    if (!isNew)
-		eChunk.setOldChunk();
-	    break;
-	}
 
 	if (eChunk == null) {
 	    eChunk = new ExploreChunk(player, ChunkX, ChunkZ);
@@ -84,6 +80,29 @@ public class ExploreManager {
 	    eRegion.addChunk(eChunk);
 	    return new ExploreRespond(eChunk.getCount(), true);
 	}
+	eChunk.setOldChunk();
 	return eChunk.addPlayer(player);
     }
+
+    public void addChunk(String player, String worldName, int x, int z) {
+	int ChunkX = x;
+	int ChunkZ = z;
+	int RegionX = (int) Math.floor(ChunkX / 32D);
+	int RegionZ = (int) Math.floor(ChunkZ / 32D);
+	if (!worlds.containsKey(worldName)) {
+	    ExploreChunk eChunk = new ExploreChunk(player, ChunkX, ChunkZ);
+	    eChunk.setOldChunk();
+	    ExploreRegion eRegion = new ExploreRegion(RegionX, RegionZ);
+	    eRegion.addChunk(eChunk);
+	    worlds.put(worldName, eRegion);
+	}
+	ExploreRegion eRegion = worlds.get(worldName);
+	ExploreChunk eChunk = eRegion.getChunk(ChunkX + ":" + ChunkZ);
+	if (eChunk == null) {
+	    eChunk = new ExploreChunk(player, ChunkX, ChunkZ);
+	    eChunk.setOldChunk();
+	    eRegion.addChunk(eChunk);
+	} else
+	    eChunk.setOldChunk();
+    }
 }

com/gamingmesh/jobs/container/ExploreRegion.java

@@ -1,13 +1,12 @@
 package com.gamingmesh.jobs.container;
 
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.List;
 
 public class ExploreRegion {
 
     int x;
     int z;
-    List<ExploreChunk> chunks = new ArrayList<ExploreChunk>();
+    HashMap<String, ExploreChunk> chunks = new HashMap<String, ExploreChunk>();
 
     public ExploreRegion(int x, int z) {
 	this.x = x;
@@ -15,10 +14,14 @@ public class ExploreRegion {
     }
 
     public void addChunk(ExploreChunk chunk) {
-	chunks.add(chunk);
+	chunks.put(chunk.getX() + ":" + chunk.getZ(), chunk);
     }
 
-    public List<ExploreChunk> getChunks() {
+    public HashMap<String, ExploreChunk> getChunks() {
 	return chunks;
     }
+
+    public ExploreChunk getChunk(String cord) {
+	return chunks.get(cord);
+    }
 }

com/gamingmesh/jobs/dao/JobsDAO.java

@@ -1310,13 +1310,13 @@ public abstract class JobsDAO {
 	    HashMap<String, ExploreRegion> temp = new HashMap<String, ExploreRegion>(Jobs.getExplore().getWorlds());
 
 	    for (Entry<String, ExploreRegion> worlds : temp.entrySet()) {
-		for (ExploreChunk oneChunk : worlds.getValue().getChunks()) {
+		for (Entry<String, ExploreChunk> oneChunk : worlds.getValue().getChunks().entrySet()) {
-		    if (!oneChunk.isNew())
+		    if (!oneChunk.getValue().isNew())
 			continue;
-		    for (String oneuser : oneChunk.getPlayers()) {
+		    for (String oneuser : oneChunk.getValue().getPlayers()) {
 			prest2.setString(1, worlds.getKey());
-			prest2.setInt(2, oneChunk.getX());
+			prest2.setInt(2, oneChunk.getValue().getX());
-			prest2.setInt(3, oneChunk.getZ());
+			prest2.setInt(3, oneChunk.getValue().getZ());
 			prest2.setString(4, oneuser);
 			prest2.addBatch();
 			i++;