X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FOptions.java;h=f77c0856b62b2c3a85e4ba7ff5fdf71860bd28e5;hp=cbe88c8ecb12fc37b2bce37f38d6ed14099d3380;hb=8409411dedce0dd2512bb140f2719f4cb281bc76;hpb=4fbd14bc87ec25ec5f68f0854d1feb0cd64a5ee4

diff --git a/src/main/java/net/pterodactylus/sone/core/Options.java b/src/main/java/net/pterodactylus/sone/core/Options.java
index cbe88c8..f77c085 100644
--- a/src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/src/main/java/net/pterodactylus/sone/core/Options.java
@@ -2,6 +2,7 @@ package net.pterodactylus.sone.core;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -93,7 +94,7 @@ public class Options {
 		private final T defaultValue;
 
 		/** The current value. */
-		private T value;
+		private volatile T value;
 
 		/** The option watcher. */
 		private final List<OptionWatcher<T>> optionWatchers = new ArrayList<OptionWatcher<T>>();
@@ -155,10 +156,10 @@ public class Options {
 	}
 
 	/** Holds all {@link Boolean} {@link Option}s. */
-	private final Map<String, Option<Boolean>> booleanOptions = new HashMap<String, Option<Boolean>>();
+	private final Map<String, Option<Boolean>> booleanOptions = Collections.synchronizedMap(new HashMap<String, Option<Boolean>>());
 
 	/** Holds all {@link Integer} {@link Option}s. */
-	private final Map<String, Option<Integer>> integerOptions = new HashMap<String, Option<Integer>>();
+	private final Map<String, Option<Integer>> integerOptions = Collections.synchronizedMap(new HashMap<String, Option<Integer>>());
 
 	/**
 	 * Adds a boolean option.