Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-28 18:21:03 +01:00
Code Issues Projects Releases Wiki Activity

Fixed NPE when faction had no leader #442

Browse Source
This commit is contained in:
Rsl1122 2017-12-03 10:08:15 +02:00
parent 7f27bc5d38
commit f92a47967f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java
View File

@ -38,7 +38,7 @@ public class FactionAccordionCreator {
double maxPower = faction.getPowerMax();
String powerString = FormatUtils.cutDecimals(power) + " / " + FormatUtils.cutDecimals(maxPower);
MPlayer leader = faction.getLeader();
String leaderName = leader.getName();
String leaderName = leader != null ? leader.getName() : "No Leader";
int landCount = faction.getLandCount();
@ -46,6 +46,9 @@ public class FactionAccordionCreator {
List<MPlayer> mPlayers = faction.getMPlayers();
int membersNum = mPlayers.size();
for (MPlayer mPlayer : mPlayers) {
if (mPlayer == null) {
continue;
}
UUID uuid = Plan.getInstance().getDataCache().getUUIDof(mPlayer.getName());
if (uuid != null) {
members.add(uuid);

3
PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java
View File

@ -33,7 +33,8 @@ public class TownAccordionCreator {
for (Town town : towns) {
String townName = town.getName();
String mayorName = town.getMayor().getName();
Resident mayor = town.getMayor();
String mayorName = mayor != null ? mayor.getName() : "NPC";
String coordinates = "";
try {