mirror of
https://github.com/Zrips/Jobs.git
synced 2024-11-29 14:05:25 +01:00
Fixing null player for bossbar message
This commit is contained in:
Zrips
parent
2056525a16
commit
dfab76b273
@ -19,156 +19,153 @@ public class BossBarManager {
|
||||
private Jobs plugin;
|
||||
|
||||
public BossBarManager(Jobs plugin) {
|
||||
this.plugin = plugin;
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void ShowJobProgression(final JobsPlayer player) {
|
||||
if (Version.getCurrent().isLower(Version.v1_9_R1) || player == null)
|
||||
return;
|
||||
if (Version.getCurrent().isLower(Version.v1_9_R1) || player == null)
|
||||
return;
|
||||
|
||||
for (JobProgression oneJob : player.progression) {
|
||||
if (oneJob.getLastExperience() != 0) {
|
||||
ShowJobProgression(player, oneJob, oneJob.getLastExperience());
|
||||
}
|
||||
}
|
||||
player.getUpdateBossBarFor().clear();
|
||||
for (JobProgression oneJob : player.progression) {
|
||||
if (oneJob.getLastExperience() != 0) {
|
||||
ShowJobProgression(player, oneJob, oneJob.getLastExperience());
|
||||
}
|
||||
}
|
||||
player.getUpdateBossBarFor().clear();
|
||||
}
|
||||
|
||||
public void ShowJobProgression(final JobsPlayer player, final JobProgression jobProg, double expGain)
|
||||
{
|
||||
if(Jobs.getGCManager().isBossBarAsync())
|
||||
{
|
||||
Bukkit.getScheduler().runTaskAsynchronously(Jobs.getInstance(), () -> ShowJobProgressionInTask(player, jobProg, expGain));
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowJobProgressionInTask(player, jobProg, expGain);
|
||||
}
|
||||
}
|
||||
public void ShowJobProgression(final JobsPlayer player, final JobProgression jobProg, double expGain) {
|
||||
if (Jobs.getGCManager().isBossBarAsync()) {
|
||||
Bukkit.getScheduler().runTaskAsynchronously(Jobs.getInstance(), () -> ShowJobProgressionInTask(player, jobProg, expGain));
|
||||
} else {
|
||||
ShowJobProgressionInTask(player, jobProg, expGain);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void ShowJobProgressionInTask(final JobsPlayer player, final JobProgression jobProg, double expGain) {
|
||||
if (Version.getCurrent().isLower(Version.v1_9_R1) || !Jobs.getGCManager().BossBarsMessageByDefault)
|
||||
return;
|
||||
private synchronized void ShowJobProgressionInTask(final JobsPlayer player, final JobProgression jobProg, double expGain) {
|
||||
if (Version.getCurrent().isLower(Version.v1_9_R1) || !Jobs.getGCManager().BossBarsMessageByDefault)
|
||||
return;
|
||||
|
||||
if (!ToggleBarHandling.getBossBarToggle().getOrDefault(player.getUniqueId().toString(), true))
|
||||
return;
|
||||
if (!ToggleBarHandling.getBossBarToggle().getOrDefault(player.getUniqueId().toString(), true))
|
||||
return;
|
||||
|
||||
BossBar bar = null;
|
||||
BossBarInfo oldOne = null;
|
||||
for (BossBarInfo one : player.getBossBarInfo()) {
|
||||
if (one.getJobName().equalsIgnoreCase(jobProg.getJob().getName())) {
|
||||
one.cancel();
|
||||
bar = one.getBar();
|
||||
oldOne = one;
|
||||
break;
|
||||
}
|
||||
}
|
||||
BossBar bar = null;
|
||||
BossBarInfo oldOne = null;
|
||||
for (BossBarInfo one : player.getBossBarInfo()) {
|
||||
if (one.getJobName().equalsIgnoreCase(jobProg.getJob().getName())) {
|
||||
one.cancel();
|
||||
bar = one.getBar();
|
||||
oldOne = one;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
String gain = "";
|
||||
if (expGain != 0) {
|
||||
expGain = (int) (expGain * 100) / 100D;
|
||||
gain = expGain > 0 ? "+" + expGain : "" + expGain;
|
||||
gain = Jobs.getLanguage().getMessage("command.stats.bossBarGain", "%gain%", gain);
|
||||
}
|
||||
String gain = "";
|
||||
if (expGain != 0) {
|
||||
expGain = (int) (expGain * 100) / 100D;
|
||||
gain = expGain > 0 ? "+" + expGain : "" + expGain;
|
||||
gain = Jobs.getLanguage().getMessage("command.stats.bossBarGain", "%gain%", gain);
|
||||
}
|
||||
|
||||
String message = Jobs.getLanguage().getMessage("command.stats.bossBarOutput",
|
||||
"%joblevel%", jobProg.getLevelFormatted(),
|
||||
"%jobname%", jobProg.getJob().getDisplayName(),
|
||||
"%jobxp%", String.format(Jobs.getGCManager().getDecimalPlacesMoney(), jobProg.getExperience()),
|
||||
"%jobmaxxp%", jobProg.getMaxExperience(),
|
||||
"%gain%", gain);
|
||||
String message = Jobs.getLanguage().getMessage("command.stats.bossBarOutput",
|
||||
"%joblevel%", jobProg.getLevelFormatted(),
|
||||
"%jobname%", jobProg.getJob().getDisplayName(),
|
||||
"%jobxp%", String.format(Jobs.getGCManager().getDecimalPlacesMoney(), jobProg.getExperience()),
|
||||
"%jobmaxxp%", jobProg.getMaxExperience(),
|
||||
"%gain%", gain);
|
||||
|
||||
if (bar == null) {
|
||||
BarColor color = getColor(jobProg.getJob());
|
||||
if (color == null) {
|
||||
switch (player.getBossBarInfo().size()) {
|
||||
case 1:
|
||||
color = BarColor.GREEN;
|
||||
break;
|
||||
case 2:
|
||||
color = BarColor.RED;
|
||||
break;
|
||||
case 3:
|
||||
color = BarColor.WHITE;
|
||||
break;
|
||||
case 4:
|
||||
color = BarColor.YELLOW;
|
||||
break;
|
||||
case 5:
|
||||
color = BarColor.PINK;
|
||||
break;
|
||||
case 6:
|
||||
color = BarColor.PURPLE;
|
||||
break;
|
||||
default:
|
||||
color = BarColor.BLUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
BarStyle style;
|
||||
switch (Jobs.getGCManager().SegmentCount) {
|
||||
case 1:
|
||||
style = BarStyle.SOLID;
|
||||
break;
|
||||
case 6:
|
||||
style = BarStyle.SEGMENTED_6;
|
||||
break;
|
||||
case 10:
|
||||
style = BarStyle.SEGMENTED_10;
|
||||
break;
|
||||
case 12:
|
||||
style = BarStyle.SEGMENTED_12;
|
||||
break;
|
||||
case 20:
|
||||
style = BarStyle.SEGMENTED_20;
|
||||
break;
|
||||
default:
|
||||
style = BarStyle.SOLID;
|
||||
break;
|
||||
}
|
||||
bar = Bukkit.createBossBar(message, color, style);
|
||||
} else
|
||||
bar.setTitle(message);
|
||||
if (bar == null) {
|
||||
BarColor color = getColor(jobProg.getJob());
|
||||
if (color == null) {
|
||||
switch (player.getBossBarInfo().size()) {
|
||||
case 1:
|
||||
color = BarColor.GREEN;
|
||||
break;
|
||||
case 2:
|
||||
color = BarColor.RED;
|
||||
break;
|
||||
case 3:
|
||||
color = BarColor.WHITE;
|
||||
break;
|
||||
case 4:
|
||||
color = BarColor.YELLOW;
|
||||
break;
|
||||
case 5:
|
||||
color = BarColor.PINK;
|
||||
break;
|
||||
case 6:
|
||||
color = BarColor.PURPLE;
|
||||
break;
|
||||
default:
|
||||
color = BarColor.BLUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
BarStyle style;
|
||||
switch (Jobs.getGCManager().SegmentCount) {
|
||||
case 1:
|
||||
style = BarStyle.SOLID;
|
||||
break;
|
||||
case 6:
|
||||
style = BarStyle.SEGMENTED_6;
|
||||
break;
|
||||
case 10:
|
||||
style = BarStyle.SEGMENTED_10;
|
||||
break;
|
||||
case 12:
|
||||
style = BarStyle.SEGMENTED_12;
|
||||
break;
|
||||
case 20:
|
||||
style = BarStyle.SEGMENTED_20;
|
||||
break;
|
||||
default:
|
||||
style = BarStyle.SOLID;
|
||||
break;
|
||||
}
|
||||
bar = Bukkit.createBossBar(message, color, style);
|
||||
} else
|
||||
bar.setTitle(message);
|
||||
|
||||
double percentage = jobProg.getExperience() / jobProg.getMaxExperience();
|
||||
percentage = percentage > 1D ? 1D : percentage < 0 ? 0 : percentage;
|
||||
bar.setProgress(percentage);
|
||||
double percentage = jobProg.getExperience() / jobProg.getMaxExperience();
|
||||
percentage = percentage > 1D ? 1D : percentage < 0 ? 0 : percentage;
|
||||
bar.setProgress(percentage);
|
||||
|
||||
if (oldOne == null) {
|
||||
bar.addPlayer(player.getPlayer());
|
||||
oldOne = new BossBarInfo(player.getName(), jobProg.getJob().getName(), bar);
|
||||
player.getBossBarInfo().add(oldOne);
|
||||
}
|
||||
if (oldOne == null && player.getPlayer() != null) {
|
||||
bar.addPlayer(player.getPlayer());
|
||||
oldOne = new BossBarInfo(player.getName(), jobProg.getJob().getName(), bar);
|
||||
player.getBossBarInfo().add(oldOne);
|
||||
}
|
||||
|
||||
bar.setVisible(true);
|
||||
bar.setVisible(true);
|
||||
|
||||
oldOne.setId(Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
for (BossBarInfo one : player.getBossBarInfo()) {
|
||||
if (!one.getPlayerName().equalsIgnoreCase(player.getName()))
|
||||
continue;
|
||||
if (oldOne != null)
|
||||
oldOne.setId(Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
for (BossBarInfo one : player.getBossBarInfo()) {
|
||||
if (!one.getPlayerName().equalsIgnoreCase(player.getName()))
|
||||
continue;
|
||||
|
||||
if (!one.getJobName().equalsIgnoreCase(jobProg.getJob().getName()))
|
||||
continue;
|
||||
if (!one.getJobName().equalsIgnoreCase(jobProg.getJob().getName()))
|
||||
continue;
|
||||
|
||||
BossBar tempBar = one.getBar();
|
||||
tempBar.setVisible(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}, Jobs.getGCManager().BossBarTimer * 20L));
|
||||
BossBar tempBar = one.getBar();
|
||||
tempBar.setVisible(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}, Jobs.getGCManager().BossBarTimer * 20L));
|
||||
|
||||
jobProg.setLastExperience(0D);
|
||||
jobProg.setLastExperience(0D);
|
||||
}
|
||||
|
||||
private static BarColor getColor(Job job) {
|
||||
if (job.getBossbar() == null)
|
||||
return null;
|
||||
for (BarColor color : BarColor.values()) {
|
||||
if (job.getBossbar().equalsIgnoreCase(color.name()))
|
||||
return color;
|
||||
}
|
||||
return null;
|
||||
if (job.getBossbar() == null)
|
||||
return null;
|
||||
for (BarColor color : BarColor.values()) {
|
||||
if (job.getBossbar().equalsIgnoreCase(color.name()))
|
||||
return color;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user