Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-30 20:11:23 +01:00
Code Issues Projects Releases Wiki Activity

Check if player is online by actual Player object

Browse Source
This commit is contained in:
Zrips 2017-01-14 13:08:42 +02:00
parent 8f0d598c98
commit d9d2a791a3
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com/gamingmesh/jobs/PlayerManager.java
View File

@ -53,6 +53,7 @@ import com.gamingmesh.jobs.dao.JobsDAO;
import com.gamingmesh.jobs.dao.JobsDAOData;
import com.gamingmesh.jobs.economy.PointsData;
import com.gamingmesh.jobs.stuff.ChatColor;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.PerformCommands;
import com.gamingmesh.jobs.stuff.Perm;
@ -621,6 +622,7 @@ public class PlayerManager {
}
public BoostMultiplier getBoost(JobsPlayer player, Job job, boolean force) {
Debug.D("getting boost");
BoostMultiplier b = new BoostMultiplier();
for (CurrencyType one : CurrencyType.values()) {
b.add(one, getBoost(player, job, one, force));

24
com/gamingmesh/jobs/container/JobsPlayer.java
View File

@ -33,6 +33,7 @@ import com.gamingmesh.jobs.dao.JobsDAO;
import com.gamingmesh.jobs.economy.PaymentData;
import com.gamingmesh.jobs.resources.jfep.Parser;
import com.gamingmesh.jobs.stuff.ChatColor;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.Perm;
import com.gamingmesh.jobs.stuff.TimeManage;
@ -172,7 +173,7 @@ public class JobsPlayer {
this.player = Bukkit.getPlayer(this.playerUUID);
return this.player;
}
/**
* Get the VipSpawnerMultiplier
* @return the Multiplier
@ -202,16 +203,12 @@ public class JobsPlayer {
public double getBoost(String JobName, CurrencyType type, boolean force) {
double Boost = 0D;
Debug.D("1 "+this.isOnline());
if (this.OffPlayer == null)
return Boost;
if (this.player == null)
this.player = Bukkit.getPlayer(this.OffPlayer.getUniqueId());
if (this.player == null)
if (!this.isOnline())
return Boost;
Debug.D("4 ");
long time = System.currentTimeMillis();
if (this.boostCounter.containsKey(JobName)) {
@ -254,6 +251,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("bonus " + Boost);
return Boost == null ? 0D : Boost;
}
@ -315,7 +313,7 @@ public class JobsPlayer {
*/
public boolean havePermission(String perm) {
if (this.player == null)
this.player = Bukkit.getPlayer(this.playerUUID);
this.player = Bukkit.getPlayer(this.getPlayerUUID());
if (this.player != null)
return Perm.hasPermission(player, perm);
return false;
@ -350,7 +348,11 @@ public class JobsPlayer {
* @return the playerUUID
*/
public UUID getPlayerUUID() {
return playerUUID;
if (this.playerUUID == null && player != null)
this.playerUUID = player.getUniqueId();
if (this.playerUUID == null && this.OffPlayer != null)
this.playerUUID = OffPlayer.getUniqueId();
return this.playerUUID;
}
public void setPlayerUUID(UUID uuid) {
@ -670,6 +672,8 @@ public class JobsPlayer {
* @return true if online, otherwise false
*/
public boolean isOnline() {
if (this.getPlayer() != null)
return this.getPlayer().isOnline();
return isOnline;
}