EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Party NPE fix

Browse Source
This commit is contained in:
nossr50 2019-04-21 16:56:26 -07:00
parent 227fb49dec
commit 7506646862
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -7,6 +7,9 @@ Key:
! Change ! Change
- Removal - Removal
Version 2.1.47
Fix NPE when party leader is offline and players grab a party list
Version 2.1.46 Version 2.1.46
Party member lists now show the whole party, including offline players again. Party member lists now show the whole party, including offline players again.
Party lists now have special markers for players who are in shared XP range Party lists now have special markers for players who are in shared XP range

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.1.46</version> <version>2.1.47-SNAPSHOT</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url> <url>https://github.com/mcMMO-Dev/mcMMO</url>
<scm> <scm>

2
src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
View File

@ -130,7 +130,5 @@ public class PartyInfoCommand implements CommandExecutor {
player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header")); player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", nearMembers.size()+1, membersOnline)); player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", nearMembers.size()+1, membersOnline));
player.sendMessage(party.createMembersList(player)); player.sendMessage(party.createMembersList(player));
} }
} }

7
src/main/java/com/gmail/nossr50/datatypes/party/Party.java
View File

@ -373,6 +373,9 @@ public class Party {
} }
} }
if(offlineMembers.contains(leader.getUniqueId()))
isPartyLeaderOfflineOrHidden = true;
//Add all the actually offline members //Add all the actually offline members
offlineOrHiddenPartyList.addAll(offlineMembers); offlineOrHiddenPartyList.addAll(offlineMembers);
@ -407,10 +410,10 @@ public class Party {
applyOnlineAndRangeFormatting(memberList, true, nearbyPlayerList.contains(Bukkit.getPlayer(leader.getUniqueId()))); applyOnlineAndRangeFormatting(memberList, true, nearbyPlayerList.contains(Bukkit.getPlayer(leader.getUniqueId())));
if(useDisplayNames) { if(useDisplayNames) {
memberList.append(Bukkit.getPlayer(leader.getUniqueId()).getDisplayName()); memberList.append(leader.getPlayerName());
} else { } else {
memberList.append(ChatColor.GOLD) memberList.append(ChatColor.GOLD)
.append(Bukkit.getPlayer(leader.getUniqueId()).getName()); .append(Bukkit.getOfflinePlayer(leader.getUniqueId()));
} }
} }

2
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -79,7 +79,7 @@ public class MiningManager extends SkillManager {
SkillUtils.handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), Config.getInstance().getAbilityToolDamage()); SkillUtils.handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), Config.getInstance().getAbilityToolDamage());
} }
if ((mcMMO.getModManager().isCustomMiningBlock(blockState) && !mcMMO.getModManager().getBlock(blockState).isDoubleDropEnabled()) || !Config.getInstance().getDoubleDropsEnabled(skill, material)) { if ((mcMMO.getModManager().isCustomMiningBlock(blockState) && !mcMMO.getModManager().getBlock(blockState).isDoubleDropEnabled())) {
return; return;
} }