|
@@ -1,6 +1,7 @@
|
|
package com.gmail.nossr50.commands.party;
|
|
package com.gmail.nossr50.commands.party;
|
|
|
|
|
|
import com.gmail.nossr50.datatypes.party.Party;
|
|
import com.gmail.nossr50.datatypes.party.Party;
|
|
|
|
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
|
|
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
|
|
import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
|
|
import com.gmail.nossr50.locale.LocaleLoader;
|
|
import com.gmail.nossr50.locale.LocaleLoader;
|
|
import com.gmail.nossr50.party.PartyManager;
|
|
import com.gmail.nossr50.party.PartyManager;
|
|
@@ -15,13 +16,14 @@ public class PartyDisbandCommand implements CommandExecutor {
|
|
@Override
|
|
@Override
|
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
|
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
|
|
if (args.length == 1) {
|
|
if (args.length == 1) {
|
|
- if (UserManager.getPlayer((Player) sender) == null) {
|
|
|
|
|
|
+ final McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
|
|
|
|
+ if (mcMMOPlayer == null) {
|
|
sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
|
|
sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
- Party playerParty = UserManager.getPlayer((Player) sender).getParty();
|
|
|
|
- String partyName = playerParty.getName();
|
|
|
|
|
|
+ final Party playerParty = mcMMOPlayer.getParty();
|
|
|
|
+ final String partyName = playerParty.getName();
|
|
|
|
|
|
for (Player member : playerParty.getOnlineMembers()) {
|
|
for (Player member : playerParty.getOnlineMembers()) {
|
|
if (!PartyManager.handlePartyChangeEvent(member, partyName, null, EventReason.KICKED_FROM_PARTY)) {
|
|
if (!PartyManager.handlePartyChangeEvent(member, partyName, null, EventReason.KICKED_FROM_PARTY)) {
|
|
@@ -31,7 +33,7 @@ public class PartyDisbandCommand implements CommandExecutor {
|
|
member.sendMessage(LocaleLoader.getString("Party.Disband"));
|
|
member.sendMessage(LocaleLoader.getString("Party.Disband"));
|
|
}
|
|
}
|
|
|
|
|
|
- PartyManager.disbandParty(playerParty);
|
|
|
|
|
|
+ PartyManager.disbandParty(mcMMOPlayer, playerParty);
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "disband"));
|
|
sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "disband"));
|