Skip to content

Commit ed0f6be

Browse files
committed
fix tne null pointer
1 parent d60f8b4 commit ed0f6be

File tree

5 files changed

+26
-15
lines changed

5 files changed

+26
-15
lines changed

src/main/java/com/github/elic0de/thejpspit/config/Settings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class Settings {
6767
private List<String> scoreboard = Arrays.asList(
6868
"",
6969
"レベル: [%level%]",
70-
"JP: [%vault_eco_balance%]",
70+
"JP: [%coins%]",
7171
"",
7272
"K/Dレート: &c%rating%",
7373
"最高レート: &b%bestRating%",

src/main/java/com/github/elic0de/thejpspit/hook/EconomyHook.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ protected EconomyHook(TheJpsPit plugin, String name) {
1111
super(plugin, name);
1212
}
1313

14+
public abstract BigDecimal getBalance(PitPlayer player);
15+
1416
public abstract boolean hasMoney(PitPlayer player, BigDecimal amount);
1517

1618
public abstract void takeMoney(PitPlayer player, BigDecimal amount);

src/main/java/com/github/elic0de/thejpspit/hook/TneEconomyHook.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void onEnable() throws IllegalStateException {
2222
plugin.getLogger().log(Level.INFO, "Enabled Vault economy hook");
2323
}
2424

25-
private BigDecimal getBalance(@NotNull PitPlayer player) {
25+
public BigDecimal getBalance(@NotNull PitPlayer player) {
2626
return tneAPI.getAccount(player.getUniqueId()).getHoldings(player.getPlayer().getWorld().getName());
2727
}
2828

src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
package com.github.elic0de.thejpspit.player;
22

3-
import com.github.elic0de.thejpspit.config.PitPreferences;
3+
import com.github.elic0de.thejpspit.TheJpsPit;
44
import com.github.elic0de.thejpspit.database.Database;
5+
import com.github.elic0de.thejpspit.hook.EconomyHook;
56
import com.github.elic0de.thejpspit.leveler.Levels;
6-
import com.github.elic0de.thejpspit.TheJpsPit;
77
import com.github.elic0de.thejpspit.util.ShowHealth;
88
import de.themoep.minedown.MineDown;
99
import fr.mrmicky.fastboard.FastBoard;
10-
import java.math.BigDecimal;
11-
import java.util.Optional;
12-
import java.util.UUID;
13-
import java.util.stream.Stream;
1410
import org.bukkit.ChatColor;
1511
import org.bukkit.Material;
1612
import org.bukkit.Sound;
1713
import org.bukkit.entity.Player;
1814
import org.bukkit.inventory.ItemStack;
1915
import org.bukkit.inventory.PlayerInventory;
2016

17+
import java.math.BigDecimal;
18+
import java.util.Optional;
19+
import java.util.UUID;
20+
import java.util.stream.Stream;
21+
2122
public class PitPlayer {
2223

2324
private final Player player;
@@ -83,6 +84,14 @@ public PitPlayer(Player player, long kills, long streaks, long bestStreaks, long
8384
this.preferences = preferences;
8485
}
8586

87+
public BigDecimal coins() {
88+
if (TheJpsPit.getInstance().getEconomyHook().isPresent()) {
89+
final EconomyHook hook = TheJpsPit.getInstance().getEconomyHook().get();
90+
return hook.getBalance(this);
91+
}
92+
return BigDecimal.ZERO;
93+
}
94+
8695
public void addItem() {
8796
final PlayerInventory inventory = player.getInventory();
8897

src/main/java/com/github/elic0de/thejpspit/scoreboard/GameScoreboard.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ public void update() {
2929

3030
public List<String> boardLines(PitPlayer player) {
3131
return TheJpsPit.getInstance().getSettings().getScoreboard().stream().map(s -> PlaceholderAPI.setPlaceholders(player.getPlayer(), s)).map(s ->
32-
s.replaceAll("%level%", Levels.getPlayerLevelColor(player.getLevel()) + "" + player.getLevel() + ChatColor.RESET)
33-
.replaceAll("%neededXp%", Levels.getPlayerNeededXP(player.getLevel(),
34-
(int) player.getXp()) + "")
35-
.replaceAll("%rating%", player.getRating() + "%")
36-
.replaceAll("%bestRating%", player.getBestRating() + "%")
37-
.replaceAll("%streaks%", player.getStreaks() + "")
38-
.replaceAll("%bestStreaks%", player.getBestStreaks() + "")
32+
s.replaceAll("%level%", Levels.getPlayerLevelColor(player.getLevel()) + "" + player.getLevel() + ChatColor.RESET)
33+
.replaceAll("%neededXp%", Levels.getPlayerNeededXP(player.getLevel(), (int) player.getXp()) + "")
34+
.replaceAll("%rating%", player.getRating() + "%")
35+
.replaceAll("%bestRating%", player.getBestRating() + "%")
36+
.replaceAll("%streaks%", player.getStreaks() + "")
37+
.replaceAll("%bestStreaks%", player.getBestStreaks() + "")
38+
.replaceAll("%coins%", player.coins().toPlainString())
3939
).collect(Collectors.toList());
4040
}
4141

0 commit comments

Comments
 (0)