Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-01 15:03:36 +01:00
Code Issues Projects Releases Wiki Activity

We don't need this ones anymore.

Browse Source
This commit is contained in:
Zrips 2018-11-13 19:14:21 +02:00
parent 855cea13ef
commit 11af61064c
3 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gamingmesh/jobs/PlayerManager.java
View File

@ -61,7 +61,7 @@ import com.gamingmesh.jobs.economy.PointsData;
import com.gamingmesh.jobs.stuff.PerformCommands;
public class PlayerManager {
// private Map<String, JobsPlayer> players = Collections.synchronizedMap(new HashMap<String, JobsPlayer>());
private ConcurrentHashMap<String, JobsPlayer> playersCache = new ConcurrentHashMap<>();
private ConcurrentHashMap<UUID, JobsPlayer> playersUUIDCache = new ConcurrentHashMap<>();
private ConcurrentHashMap<String, JobsPlayer> players = new ConcurrentHashMap<>();
@ -175,7 +175,6 @@ public class PlayerManager {
}
this.addPlayer(jPlayer);
jPlayer.setPlayer(player);
AutoJoinJobs(player);
jPlayer.onConnect();
jPlayer.reloadHonorific();
@ -294,7 +293,7 @@ public class PlayerManager {
if (info.getName() == null)
return null;
JobsPlayer jPlayer = new JobsPlayer(info.getName(), null);
JobsPlayer jPlayer = new JobsPlayer(info.getName());
jPlayer.setPlayerUUID(info.getUuid());
jPlayer.setUserId(info.getID());
jPlayer.setDoneQuests(info.getQuestsDone());

35
src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
View File

@ -26,7 +26,6 @@ import java.util.Map.Entry;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import com.gamingmesh.jobs.Jobs;
@ -58,9 +57,6 @@ public class JobsPlayer {
// player online status
private volatile boolean isOnline = false;
private OfflinePlayer OffPlayer = null;
private Player player = null;
private HashMap<CurrencyType, Integer> limits = new HashMap<>();
private int userid = -1;
@ -81,10 +77,8 @@ public class JobsPlayer {
private HashMap<String, HashMap<String, QuestProgression>> qProgression = new HashMap<>();
private int doneQuests = 0;
public JobsPlayer(String userName, OfflinePlayer OffPlayer) {
public JobsPlayer(String userName) {
this.userName = userName;
this.OffPlayer = OffPlayer;
this.player = Bukkit.getPlayer(userName);
}
public ArchivedJobs getArchivedJobs() {
@ -148,10 +142,6 @@ public class JobsPlayer {
return true;
}
public void setPlayer(Player player) {
this.player = player;
}
public void loadLogFromDao() {
Jobs.getJobsDAO().loadLog(this);
}
@ -196,14 +186,9 @@ public class JobsPlayer {
*/
public Player getPlayer() {
if (this.playerUUID != null) {
Player p = Bukkit.getPlayer(this.playerUUID);
if (p != null) {
this.player = p;
this.OffPlayer = p;
this.userName = player.getName();
}
return Bukkit.getPlayer(this.playerUUID);
}
return this.player;
return null;
}
/**
@ -261,7 +246,7 @@ public class JobsPlayer {
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all." + type.getName().toLowerCase());
if (Boost == null || v1 != null && v1 > Boost)
Boost = v1;
Debug.D(Boost +" "+ JobName + " " + type);
Debug.D(Boost + " " + JobName + " " + type);
return Boost == null ? 0D : Boost;
}
@ -332,9 +317,8 @@ public class JobsPlayer {
* @return true if have
*/
public boolean havePermission(String perm) {
if (this.player == null)
this.player = Bukkit.getPlayer(this.getPlayerUUID());
if (this.player != null)
Player player = Bukkit.getPlayer(this.getPlayerUUID());
if (player != null)
return Perm.hasPermission(player, perm);
return false;
}
@ -356,10 +340,9 @@ public class JobsPlayer {
* @return the userName
*/
public String getUserName() {
Player player = Bukkit.getPlayer(this.getPlayerUUID());
if (player != null)
userName = player.getName();
if (userName == null && OffPlayer != null)
userName = OffPlayer.getName();
return userName;
}
@ -368,10 +351,6 @@ public class JobsPlayer {
* @return the playerUUID
*/
public UUID getPlayerUUID() {
if (this.playerUUID == null && player != null)
this.playerUUID = player.getUniqueId();
if (this.playerUUID == null && this.OffPlayer != null)
this.playerUUID = OffPlayer.getUniqueId();
return this.playerUUID;
}

5
src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
View File

@ -1231,8 +1231,9 @@ public abstract class JobsDAO {
public JobsPlayer loadFromDao(OfflinePlayer player) {
JobsPlayer jPlayer = new JobsPlayer(player.getName(), player);
jPlayer.playerUUID = player.getUniqueId();
JobsPlayer jPlayer = new JobsPlayer(player.getName());
jPlayer.setPlayerUUID(player.getUniqueId());
List<JobsDAOData> list = getAllJobs(player);
// synchronized (jPlayer.saveLock) {
jPlayer.progression.clear();