X-Git-Url: https://git.pterodactylus.net/?p=xudocci.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fdata%2FBot.java;h=c9e2a9b822b80d1e5d0b6a186738d2cb7ff980e3;hp=211dde7e78130da750d645ba6cea55369474f0e5;hb=428a71042507e2fe0fce5b1b144ed60ec49d3183;hpb=a1ad62aece998bef7d62cab8fa31a839d1d16ef8

diff --git a/src/main/java/net/pterodactylus/xdcc/data/Bot.java b/src/main/java/net/pterodactylus/xdcc/data/Bot.java
index 211dde7..c9e2a9b 100644
--- a/src/main/java/net/pterodactylus/xdcc/data/Bot.java
+++ b/src/main/java/net/pterodactylus/xdcc/data/Bot.java
@@ -20,6 +20,7 @@ package net.pterodactylus.xdcc.data;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -39,6 +40,7 @@ public class Bot implements Iterable<Pack> {
 
 	/** The packs this bot carries. */
 	private final Map<String, Pack> packs = Maps.newHashMap();
+	private final Map<String, Pack> packsByName = Maps.newHashMap();
 
 	/** The current name of the bot. */
 	private String name;
@@ -81,7 +83,9 @@ public class Bot implements Iterable<Pack> {
 	 * @return The packs this bot carries
 	 */
 	public Collection<Pack> packs() {
-		return packs.values();
+		synchronized (packs) {
+			return Collections.unmodifiableCollection(packs.values());
+		}
 	}
 
 	//
@@ -111,7 +115,14 @@ public class Bot implements Iterable<Pack> {
 	 * 		The pack to add
 	 */
 	public void addPack(Pack pack) {
-		packs.put(pack.id(), pack);
+		synchronized (this) {
+			if (packsByName.containsKey(pack.name())) {
+				Pack oldPack = packsByName.remove(pack.name());
+				packs.remove(oldPack.id());
+			}
+			packs.put(pack.id(), pack);
+			packsByName.put(pack.name(), pack);
+		}
 	}
 
 	//
@@ -120,7 +131,7 @@ public class Bot implements Iterable<Pack> {
 
 	@Override
 	public Iterator<Pack> iterator() {
-		return packs.values().iterator();
+		return packs().iterator();
 	}
 
 	//