EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-02-16 22:59:35 +01:00
Code Issues Projects Releases Wiki Activity

UUID support for parties

Browse Source
This commit is contained in:
TfT_02 2014-07-12 19:44:47 +02:00
parent 7da661546f
commit 153bdc73f8
12 changed files with 160 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/gmail/nossr50/api/PartyAPI.java
View File

@ -1,14 +1,17 @@
package com.gmail.nossr50.api;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.UUID;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.party.Party;
import com.gmail.nossr50.datatypes.party.PartyLeader;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.util.player.UserManager;
@ -79,7 +82,7 @@ public final class PartyAPI {
Party party = PartyManager.getParty(partyName);
if (party == null) {
party = new Party(player.getName(), partyName);
party = new Party(new PartyLeader(player.getName(), player.getUniqueId()), partyName);
}
PartyManager.addToParty(UserManager.getPlayer(player), party);
@ -105,7 +108,7 @@ public final class PartyAPI {
* @return the leader of the party
*/
public static String getPartyLeader(String partyName) {
return PartyManager.getPartyLeader(partyName);
return PartyManager.getPartyLeaderName(partyName);
}
/**
@ -114,10 +117,11 @@ public final class PartyAPI {
* This function is designed for API usage.
*
* @param partyName The name of the party to set the leader of
* @param player The player to set as leader
* @param playerName The playerName to set as leader
*/
public static void setPartyLeader(String partyName, String player) {
PartyManager.setPartyLeader(player, PartyManager.getParty(partyName));
@Deprecated
public static void setPartyLeader(String partyName, String playerName) {
PartyManager.setPartyLeader(mcMMO.p.getServer().getOfflinePlayer(playerName).getUniqueId(), PartyManager.getParty(partyName));
}
/**
@ -132,8 +136,8 @@ public final class PartyAPI {
public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
List<OfflinePlayer> members = new ArrayList<OfflinePlayer>();
for (String memberName : PartyManager.getAllMembers(player)) {
OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
for (UUID memberUniqueId : PartyManager.getAllMembers(player).values()) {
OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberUniqueId);
members.add(member);
}
return members;
@ -147,7 +151,20 @@ public final class PartyAPI {
* @param player The player to check
* @return all the player names in the player's party
*/
@Deprecated
public static LinkedHashSet<String> getMembers(Player player) {
return (LinkedHashSet<String>) PartyManager.getAllMembers(player).keySet();
}
/**
* Get a list of all player names and uuids in this player's party.
* </br>
* This function is designed for API usage.
*
* @param player The player to check
* @return all the player names and uuids in the player's party
*/
public static LinkedHashMap<String, UUID> getMembersMap(Player player) {
return PartyManager.getAllMembers(player);
}

7
src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java
View File

@ -1,10 +1,12 @@
package com.gmail.nossr50.commands.party;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.party.Party;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager;
@ -18,13 +20,14 @@ public class PartyChangeOwnerCommand implements CommandExecutor {
case 2:
Party playerParty = UserManager.getPlayer((Player) sender).getParty();
String targetName = CommandUtils.getMatchedPlayerName(args[1]);
OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);
if (!playerParty.getMembers().contains(targetName)) {
if (!playerParty.getMembers().values().contains(target.getUniqueId())) {
sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
return true;
}
PartyManager.setPartyLeader(targetName, playerParty);
PartyManager.setPartyLeader(target.getUniqueId(), playerParty);
return true;
default:

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

@ -134,7 +134,7 @@ public class PartyCommand implements TabExecutor {
}
// Party leader commands
if (!mcMMOPlayer.getParty().getLeader().equalsIgnoreCase(player.getName())) {
if (!mcMMOPlayer.getParty().getLeader().getUniqueId().equals(player.getUniqueId())) {
sender.sendMessage(LocaleLoader.getString("Party.NotOwner"));
return true;
}

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

@ -22,7 +22,7 @@ public class PartyKickCommand implements CommandExecutor {
Party playerParty = UserManager.getPlayer((Player) sender).getParty();
String targetName = CommandUtils.getMatchedPlayerName(args[1]);
if (!playerParty.getMembers().contains(targetName)) {
if (!playerParty.getMembers().keySet().contains(targetName)) {
sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
return true;
}

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

@ -36,7 +36,7 @@ public class PartyRenameCommand implements CommandExecutor {
return true;
}
String leaderName = playerParty.getLeader();
String leaderName = playerParty.getLeader().getPlayerName();
for (Player member : playerParty.getOnlineMembers()) {
if (!PartyManager.handlePartyChangeEvent(member, oldPartyName, newPartyName, EventReason.CHANGED_PARTIES)) {

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

@ -44,7 +44,7 @@ public class PartyAllianceInviteCommand implements CommandExecutor {
return true;
}
if (!mcMMOTarget.getParty().getLeader().equalsIgnoreCase(targetName)) {
if (!mcMMOTarget.getParty().getLeader().getUniqueId().equals(target.getUniqueId())) {
player.sendMessage(LocaleLoader.getString("Party.Target.NotOwner", targetName));
return true;
}

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

@ -2,8 +2,10 @@ package com.gmail.nossr50.datatypes.party;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry;
import java.util.UUID;
import org.bukkit.ChatColor;
import org.bukkit.Sound;
@ -20,9 +22,9 @@ import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.Misc;
public class Party {
private final LinkedHashSet<String> members = new LinkedHashSet<String>();
private final LinkedHashMap<String, UUID> members = new LinkedHashMap<String, UUID>();
private String leader;
private PartyLeader leader;
private String name;
private String password;
private boolean locked;
@ -43,14 +45,14 @@ public class Party {
this.name = name;
}
public Party(String leader, String name) {
public Party(PartyLeader leader, String name) {
this.leader = leader;
this.name = name;
this.locked = true;
this.level = 0;
}
public Party(String leader, String name, String password) {
public Party(PartyLeader leader, String name, String password) {
this.leader = leader;
this.name = name;
this.password = password;
@ -58,7 +60,7 @@ public class Party {
this.level = 0;
}
public Party(String leader, String name, String password, boolean locked) {
public Party(PartyLeader leader, String name, String password, boolean locked) {
this.leader = leader;
this.name = name;
this.password = password;
@ -66,15 +68,15 @@ public class Party {
this.level = 0;
}
public LinkedHashSet<String> getMembers() {
public LinkedHashMap<String, UUID> getMembers() {
return members;
}
public List<Player> getOnlineMembers() {
List<Player> onlineMembers = new ArrayList<Player>();
for (String memberName : members) {
Player member = mcMMO.p.getServer().getPlayerExact(memberName);
for (UUID uuid : members.values()) {
Player member = mcMMO.p.getServer().getPlayer(uuid);
if (member != null) {
onlineMembers.add(member);
@ -101,7 +103,7 @@ public class Party {
return name;
}
public String getLeader() {
public PartyLeader getLeader() {
return leader;
}
@ -133,7 +135,7 @@ public class Party {
this.name = name;
}
public void setLeader(String leader) {
public void setLeader(PartyLeader leader) {
this.leader = leader;
}
@ -220,7 +222,8 @@ public class Party {
}
if (!Config.getInstance().getPartyInformAllMembers()) {
Player leader = mcMMO.p.getServer().getPlayer(this.leader);
Player leader = mcMMO.p.getServer().getPlayer(this.leader.getUniqueId());
if (leader != null) {
leader.sendMessage(LocaleLoader.getString("Party.LevelUp", levelsGained, getLevel()));
@ -306,10 +309,13 @@ public class Party {
public String createMembersList(String playerName, List<Player> nearMembers) {
StringBuilder memberList = new StringBuilder();
for (String memberName : this.getMembers()) {
Player member = mcMMO.p.getServer().getPlayerExact(memberName);
for (Entry<String, UUID> memberEntry : this.getMembers().entrySet()) {
String memberName = memberEntry.getKey();
UUID uuid = memberEntry.getValue();
if (this.getLeader().equalsIgnoreCase(memberName)) {
Player member = mcMMO.p.getServer().getPlayer(uuid);
if (this.getLeader().getUniqueId().equals(uuid)) {
memberList.append(ChatColor.GOLD);
if (member == null) {

21
src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java Normal file
View File

@ -0,0 +1,21 @@
package com.gmail.nossr50.datatypes.party;
import java.util.UUID;
public class PartyLeader {
private String playerName;
private UUID uuid;
public PartyLeader(String playerName, UUID uuid) {
this.playerName = playerName;
this.uuid = uuid;
}
public String getPlayerName() {
return playerName;
}
public UUID getUniqueId() {
return uuid;
}
}

2
src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
View File

@ -98,7 +98,7 @@ public class McMMOPlayer {
this.player = player;
playerMetadata = new FixedMetadataValue(mcMMO.p, playerName);
this.profile = profile;
party = PartyManager.getPlayerParty(playerName);
party = PartyManager.getPlayerParty(playerName, uuid);
ptpRecord = new PartyTeleportRecord();
if (profile.getUniqueId() == null) {

108
src/main/java/com/gmail/nossr50/party/PartyManager.java
View File

@ -2,8 +2,10 @@ package com.gmail.nossr50.party;
import java.io.File;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry;
import java.util.UUID;
import org.bukkit.OfflinePlayer;
import org.bukkit.Sound;
@ -15,6 +17,7 @@ import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.chat.ChatMode;
import com.gmail.nossr50.datatypes.party.ItemShareType;
import com.gmail.nossr50.datatypes.party.Party;
import com.gmail.nossr50.datatypes.party.PartyLeader;
import com.gmail.nossr50.datatypes.party.ShareMode;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.events.party.McMMOPartyAllianceChangeEvent;
@ -132,10 +135,10 @@ public final class PartyManager {
* @param player The player to check
* @return all the players in the player's party
*/
public static LinkedHashSet<String> getAllMembers(Player player) {
public static LinkedHashMap<String, UUID> getAllMembers(Player player) {
Party party = getParty(player);
return party == null ? new LinkedHashSet<String>() : party.getMembers();
return party == null ? new LinkedHashMap<String, UUID>() : party.getMembers();
}
/**
@ -184,9 +187,33 @@ public final class PartyManager {
* @param playerName The members name
* @return the existing party, null otherwise
*/
@Deprecated
public static Party getPlayerParty(String playerName) {
for (Party party : parties) {
if (party.getMembers().contains(playerName)) {
if (party.getMembers().keySet().contains(playerName)) {
return party;
}
}
return null;
}
/**
* Retrieve a party by a members uuid
*
* @param uuid The members uuid
* @return the existing party, null otherwise
*/
public static Party getPlayerParty(String playerName, UUID uuid) {
for (Party party : parties) {
LinkedHashMap<String, UUID> members = party.getMembers();
if (members.keySet().contains(playerName) || members.values().contains(uuid)) {
// Name changes
if (!members.get(playerName).equals(uuid)) {
members.put(playerName, uuid);
}
return party;
}
}
@ -222,7 +249,7 @@ public final class PartyManager {
* @param party The party
*/
public static void removeFromParty(OfflinePlayer player, Party party) {
LinkedHashSet<String> members = party.getMembers();
LinkedHashMap<String, UUID> members = party.getMembers();
String playerName = player.getName();
members.remove(playerName);
@ -232,8 +259,8 @@ public final class PartyManager {
}
else {
// If the leaving player was the party leader, appoint a new leader from the party members
if (party.getLeader().equalsIgnoreCase(playerName)) {
setPartyLeader(members.iterator().next(), party);
if (party.getLeader().getUniqueId().equals(player.getUniqueId())) {
setPartyLeader(members.values().iterator().next(), party);
}
informPartyMembersQuit(party, playerName);
@ -279,7 +306,7 @@ public final class PartyManager {
Player player = mcMMOPlayer.getPlayer();
String playerName = player.getName();
Party party = new Party(playerName, partyName.replace(".", ""), password);
Party party = new Party(new PartyLeader(playerName, player.getUniqueId()), partyName.replace(".", ""), password);
if (password != null) {
player.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
@ -408,11 +435,12 @@ public final class PartyManager {
* @param party The party
*/
public static void addToParty(McMMOPlayer mcMMOPlayer, Party party) {
String playerName = mcMMOPlayer.getPlayer().getName();
Player player = mcMMOPlayer.getPlayer();
String playerName = player.getName();
informPartyMembersJoin(party, playerName);
mcMMOPlayer.setParty(party);
party.getMembers().add(playerName);
party.getMembers().put(player.getName(), player.getUniqueId());
}
/**
@ -421,36 +449,37 @@ public final class PartyManager {
* @param partyName The party name
* @return the leader of the party
*/
public static String getPartyLeader(String partyName) {
public static String getPartyLeaderName(String partyName) {
Party party = getParty(partyName);
return party == null ? null : party.getLeader();
return party == null ? null : party.getLeader().getPlayerName();
}
/**
* Set the leader of a party.
*
* @param playerName The name of the player to set as leader
* @param uuid The uuid of the player to set as leader
* @param party The party
*/
public static void setPartyLeader(String playerName, Party party) {
String leaderName = party.getLeader();
public static void setPartyLeader(UUID uuid, Party party) {
OfflinePlayer player = mcMMO.p.getServer().getOfflinePlayer(uuid);
UUID leaderUniqueId = party.getLeader().getUniqueId();
for (Player member : party.getOnlineMembers()) {
String memberName = member.getName();
UUID memberUniqueId = member.getUniqueId();
if (memberName.equalsIgnoreCase(playerName)) {
if (memberUniqueId.equals(player.getUniqueId())) {
member.sendMessage(LocaleLoader.getString("Party.Owner.Player"));
}
else if (memberName.equalsIgnoreCase(leaderName)) {
else if (memberUniqueId.equals(leaderUniqueId)) {
member.sendMessage(LocaleLoader.getString("Party.Owner.NotLeader"));
}
else {
member.sendMessage(LocaleLoader.getString("Party.Owner.New", playerName));
member.sendMessage(LocaleLoader.getString("Party.Owner.New", player.getName()));
}
}
party.setLeader(playerName);
party.setLeader(new PartyLeader(player.getName(), player.getUniqueId()));
}
/**
@ -461,7 +490,7 @@ public final class PartyManager {
public static boolean canInvite(McMMOPlayer mcMMOPlayer) {
Party party = mcMMOPlayer.getParty();
return !party.isLocked() || party.getLeader().equalsIgnoreCase(mcMMOPlayer.getPlayer().getName());
return !party.isLocked() || party.getLeader().getUniqueId().equals(mcMMOPlayer.getPlayer().getUniqueId());
}
/**
@ -479,7 +508,13 @@ public final class PartyManager {
for (String partyName : partiesFile.getConfigurationSection("").getKeys(false)) {
Party party = new Party(partyName);
party.setLeader(partiesFile.getString(partyName + ".Leader"));
String[] leaderSplit = partiesFile.getString(partyName + ".Leader").split("[|]");
UUID leaderUniqueId = null;
if (leaderSplit.length == 2) {
leaderUniqueId = UUID.fromString(leaderSplit[1]);
}
party.setLeader(new PartyLeader(leaderSplit[0], leaderUniqueId));
party.setPassword(partiesFile.getString(partyName + ".Password"));
party.setLocked(partiesFile.getBoolean(partyName + ".Locked"));
party.setLevel(partiesFile.getInt(partyName + ".Level"));
@ -496,18 +531,26 @@ public final class PartyManager {
party.setSharingDrops(itemShareType, partiesFile.getBoolean(partyName + ".ItemShareType." + itemShareType.toString(), true));
}
List<String> memberNames = partiesFile.getStringList(partyName + ".Members");
LinkedHashSet<String> members = party.getMembers();
List<String> memberEntries = partiesFile.getStringList(partyName + ".Members");
LinkedHashMap<String, UUID> members = party.getMembers();
for (String memberName : memberNames) {
members.add(memberName);
for (String memberEntry : memberEntries) {
String[] memberSplit = memberEntry.split("[|]");
if (memberSplit.length != 2) {
members.put(memberSplit[0], null);
continue;
}
members.put(memberSplit[0], UUID.fromString(memberSplit[1]));
}
parties.add(party);
}
mcMMO.p.debug("Loaded (" + parties.size() + ") Parties...");
for (Party party : hasAlly) {
party.setAlly(getParty(partiesFile.getString(party.getName() + ".Ally")));
party.setAlly(PartyManager.getParty(partiesFile.getString(party.getName() + ".Ally")));
}
}
@ -528,7 +571,8 @@ public final class PartyManager {
for (Party party : parties) {
String partyName = party.getName();
partiesFile.set(partyName + ".Leader", party.getLeader());
String partyLeader = party.getLeader().getPlayerName() + "|" + party.getLeader().getUniqueId().toString();
partiesFile.set(partyName + ".Leader", partyLeader);
partiesFile.set(partyName + ".Password", party.getPassword());
partiesFile.set(partyName + ".Locked", party.isLocked());
partiesFile.set(partyName + ".Level", party.getLevel());
@ -543,9 +587,11 @@ public final class PartyManager {
List<String> memberNames = new ArrayList<String>();
for (String member : party.getMembers()) {
if (!memberNames.contains(member)) {
memberNames.add(member);
for (Entry<String, UUID> memberEntry : party.getMembers().entrySet()) {
String memberName = memberEntry.getKey();
String memberUniqueId = memberEntry.getValue() == null ? "" : memberEntry.getValue().toString();
if (!memberNames.contains(memberName)) {
memberNames.add(memberName + "|" + memberUniqueId);
}
}

11
src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java
View File

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import java.util.UUID;
import org.bukkit.OfflinePlayer;
import org.bukkit.scheduler.BukkitRunnable;
@ -19,21 +20,21 @@ public class PartyAutoKickTask extends BukkitRunnable {
@Override
public void run() {
HashMap<OfflinePlayer, Party> toRemove = new HashMap<OfflinePlayer, Party>();
List<String> processedPlayers = new ArrayList<String>();
List<UUID> processedPlayers = new ArrayList<UUID>();
long currentTime = System.currentTimeMillis();
for (Party party : PartyManager.getParties()) {
for (String memberName : party.getMembers()) {
OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberName);
boolean isProcessed = processedPlayers.contains(memberName);
for (UUID memberUniqueId : party.getMembers().values()) {
OfflinePlayer member = mcMMO.p.getServer().getOfflinePlayer(memberUniqueId);
boolean isProcessed = processedPlayers.contains(memberUniqueId);
if ((!member.isOnline() && (currentTime - member.getLastPlayed() > KICK_TIME)) || isProcessed) {
toRemove.put(member, party);
}
if (!isProcessed) {
processedPlayers.add(memberName);
processedPlayers.add(memberUniqueId);
}
}
}

2
src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java
View File

@ -31,7 +31,7 @@ public class PartyChatTask extends BukkitRunnable {
@Override
public void run() {
if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader())) {
if (Config.getInstance().getPartyChatColorLeaderName() && senderName.equalsIgnoreCase(party.getLeader().getPlayerName())) {
message = message.replaceFirst(Pattern.quote(displayName), ChatColor.GOLD + Matcher.quoteReplacement(displayName) + ChatColor.RESET);
}