EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-10-22 14:03:43 +02:00
Code Issues Projects Releases Wiki Activity

Return to HashMap!

Browse Source
This commit is contained in:
bm01
2012-06-24 22:46:45 +02:00
parent 0b0390620e
commit dc48d467f5
4 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@@ -285,7 +285,7 @@ public class mcMMO extends JavaPlugin {
@Override
public void onDisable() {
//Make sure to save player information if the server shuts down
for (PlayerProfile playerProfile : Users.getProfiles()) {
for (PlayerProfile playerProfile : Users.getProfiles().values()) {
playerProfile.save();
}

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

@@ -19,7 +19,7 @@ public class SQLReconnect implements Runnable {
if (!Database.isConnected()) {
Database.connect();
if (Database.isConnected()) {
for (PlayerProfile playerProfile : Users.getProfiles()) {
for (PlayerProfile playerProfile : Users.getProfiles().values()) {
playerProfile.save(); //Save all profiles
}

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

@@ -20,7 +20,7 @@ public class SaveTimer implements Runnable {
int count = 1;
BukkitScheduler bukkitScheduler = plugin.getServer().getScheduler();
for (PlayerProfile playerProfile : Users.getProfiles()) {
for (PlayerProfile playerProfile : Users.getProfiles().values()) {
bukkitScheduler.scheduleSyncDelayedTask(plugin, new ProfileSaveTask(playerProfile), count);
count++;
}

34
src/main/java/com/gmail/nossr50/util/Users.java
View File

@@ -3,9 +3,8 @@ package com.gmail.nossr50.util;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
@@ -14,7 +13,7 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.PlayerProfile;
public class Users {
private static List<PlayerProfile> profiles = new ArrayList<PlayerProfile>();
private static Map<String, PlayerProfile> profiles = new HashMap<String, PlayerProfile>();
/**
* Load users.
@@ -44,21 +43,18 @@ public class Users {
*/
public static PlayerProfile addUser(Player player) {
String playerName = player.getName();
PlayerProfile playerProfile = profiles.get(playerName);
for (Iterator<PlayerProfile> it = profiles.iterator() ; it.hasNext() ; ) {
PlayerProfile playerProfile = it.next();
if (playerProfile.getPlayerName().equals(playerName)) {
if (playerProfile != null) {
//The player object is different on each reconnection and must be updated
playerProfile.setPlayer(player);
return playerProfile;
}
else {
playerProfile = new PlayerProfile(player, playerName, true);
profiles.put(playerName, playerProfile);
}
//New player, or already removed from the list
PlayerProfile playerProfile = new PlayerProfile(player, playerName, true);
profiles.add(playerProfile);
return playerProfile;
}
@@ -74,7 +70,7 @@ public class Users {
*
* @return a HashMap containing the PlayerProfile of everyone in the database
*/
public static List<PlayerProfile> getProfiles() {
public static Map<String, PlayerProfile> getProfiles() {
return profiles;
}
@@ -95,14 +91,6 @@ public class Users {
* @return the player's profile
*/
public static PlayerProfile getProfile(String playerName) {
for (Iterator<PlayerProfile> it = profiles.iterator() ; it.hasNext() ; ) {
PlayerProfile playerProfile = it.next();
if (playerProfile.getPlayerName().equals(playerName)) {
return playerProfile;
}
}
return null;
return profiles.get(playerName);
}
}