|
@@ -6,9 +6,7 @@ import org.bukkit.command.CommandSender;
|
|
|
import org.bukkit.entity.Player;
|
|
|
|
|
|
import com.gmail.nossr50.datatypes.McMMOPlayer;
|
|
|
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
|
|
|
import com.gmail.nossr50.locale.LocaleLoader;
|
|
|
-import com.gmail.nossr50.party.Party;
|
|
|
import com.gmail.nossr50.party.PartyManager;
|
|
|
import com.gmail.nossr50.util.Permissions;
|
|
|
import com.gmail.nossr50.util.Users;
|
|
@@ -16,7 +14,6 @@ import com.gmail.nossr50.util.Users;
|
|
|
public class PartyAcceptCommand implements CommandExecutor {
|
|
|
private McMMOPlayer mcMMOPlayer;
|
|
|
private Player player;
|
|
|
- private Party playerParty;
|
|
|
|
|
|
@Override
|
|
|
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
|
@@ -35,17 +32,9 @@ public class PartyAcceptCommand implements CommandExecutor {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
- // Changing parties
|
|
|
- if (mcMMOPlayer.inParty()) {
|
|
|
- playerParty = mcMMOPlayer.getParty();
|
|
|
-
|
|
|
- if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), mcMMOPlayer.getPartyInvite().getName(), EventReason.CHANGED_PARTIES)) {
|
|
|
- return true;
|
|
|
- }
|
|
|
|
|
|
- PartyManager.removeFromParty(player.getName(), playerParty);
|
|
|
- }
|
|
|
- else if (!PartyManager.handlePartyChangeEvent(player, null, mcMMOPlayer.getPartyInvite().getName(), EventReason.JOINED_PARTY)) {
|
|
|
+ // Changing parties
|
|
|
+ if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite())) {
|
|
|
return true;
|
|
|
}
|
|
|
|