Code Cleanup Pt 2

This commit is contained in:
nossr50
2019-04-03 19:25:14 -07:00
parent 0e39656c88
commit 43037f8c13
118 changed files with 372 additions and 400 deletions

View File

@@ -29,7 +29,7 @@ import java.util.UUID;
public final class PartyManager {
private static String partiesFilePath = mcMMO.getFlatFileDirectory() + "parties.yml";
private static List<Party> parties = new ArrayList<Party>();
private static List<Party> parties = new ArrayList<>();
private static File partyFile = new File(partiesFilePath);
private PartyManager() {}
@@ -145,7 +145,7 @@ public final class PartyManager {
* @return the near party members
*/
public static List<Player> getNearMembers(McMMOPlayer mcMMOPlayer) {
List<Player> nearMembers = new ArrayList<Player>();
List<Player> nearMembers = new ArrayList<>();
Party party = mcMMOPlayer.getParty();
if (party != null) {
@@ -163,7 +163,7 @@ public final class PartyManager {
}
public static List<Player> getNearVisibleMembers(McMMOPlayer mcMMOPlayer) {
List<Player> nearMembers = new ArrayList<Player>();
List<Player> nearMembers = new ArrayList<>();
Party party = mcMMOPlayer.getParty();
if (party != null) {
@@ -192,7 +192,7 @@ public final class PartyManager {
public static LinkedHashMap<UUID, String> getAllMembers(Player player) {
Party party = getParty(player);
return party == null ? new LinkedHashMap<UUID, String>() : party.getMembers();
return party == null ? new LinkedHashMap<>() : party.getMembers();
}
/**
@@ -216,7 +216,7 @@ public final class PartyManager {
}
private static List<Player> getOnlineMembers(Party party) {
return party == null ? new ArrayList<Player>() : party.getOnlineMembers();
return party == null ? new ArrayList<>() : party.getOnlineMembers();
}
/**
@@ -589,7 +589,7 @@ public final class PartyManager {
YamlConfiguration partiesFile = YamlConfiguration.loadConfiguration(partyFile);
ArrayList<Party> hasAlly = new ArrayList<Party>();
ArrayList<Party> hasAlly = new ArrayList<>();
for (String partyName : partiesFile.getConfigurationSection("").getKeys(false)) {
Party party = new Party(partyName);
@@ -659,7 +659,7 @@ public final class PartyManager {
partiesFile.set(partyName + ".ItemShareType." + itemShareType.toString(), party.sharingDrops(itemShareType));
}
List<String> members = new ArrayList<String>();
List<String> members = new ArrayList<>();
for (Entry<UUID, String> memberEntry : party.getMembers().entrySet()) {
String memberUniqueId = memberEntry.getKey() == null ? "" : memberEntry.getKey().toString();