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

Avoid null pointer on limit check

Browse Source
This commit is contained in:
Zrips 2017-06-21 16:04:51 +03:00
parent 1abeca9a74
commit fcfd3435ee
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,6 @@ 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;
public class PlayerManager {

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

@ -168,9 +168,9 @@ public class JobsPlayer {
* @return the player
*/
public Player getPlayer() {
if (this.playerUUID != null){
if (this.playerUUID != null) {
Player p = Bukkit.getPlayer(this.playerUUID);
if (p != null){
if (p != null) {
this.player = p;
this.OffPlayer = p;
this.userName = player.getName();
@ -279,7 +279,8 @@ public class JobsPlayer {
}
public int getLimit(CurrencyType type) {
return this.limits.get(type);
Integer value = this.limits.get(type);
return value == null ? 0 : value;
}
public void resetPaymentLimit() {
@ -570,8 +571,7 @@ public class JobsPlayer {
}
}
if (numJobs > 1 && (method.equals(DisplayMethod.FULL) || method.equals(DisplayMethod.TITLE)) || method.equals(DisplayMethod.SHORT_FULL) || method.equals(
DisplayMethod.SHORT_TITLE)) {
if (numJobs > 1 && (method.equals(DisplayMethod.FULL) || method.equals(DisplayMethod.TITLE)) || method.equals(DisplayMethod.SHORT_FULL) || method.equals(DisplayMethod.SHORT_TITLE)) {
// add title to honorific
if (title != null) {
String honorificpart = title.getChatColor() + title.getShortName() + ChatColor.WHITE;
@ -632,7 +632,7 @@ public class JobsPlayer {
dao.updateSeen(this);
setSaved(true);
if (this.getPlayer() == null || !this.getPlayer().isOnline()){
if (this.getPlayer() == null || !this.getPlayer().isOnline()) {
Jobs.getPlayerManager().addPlayerToCache(this);
Jobs.getPlayerManager().removePlayer(this.getPlayer());
}