Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-06-26 14:35:04 +02:00
Code Issues Projects Releases Wiki Activity

Fix concurrency bug with new mappings being added

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2020-01-13 18:25:28 +01:00
parent 29a74c125a
commit 4cf114b7ac
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/BiomeConfig.java
View File

@ -25,8 +25,9 @@
package de.bluecolored.bluemap.core.config; package de.bluecolored.bluemap.core.config;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import de.bluecolored.bluemap.core.logger.Logger; import de.bluecolored.bluemap.core.logger.Logger;
import de.bluecolored.bluemap.core.mca.mapping.BiomeMapper; import de.bluecolored.bluemap.core.mca.mapping.BiomeMapper;
@ -37,7 +38,7 @@
public class BiomeConfig implements BiomeMapper { public class BiomeConfig implements BiomeMapper {
private ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader; private ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader;
private HashMap<Integer, Biome> biomes; private Map<Integer, Biome> biomes;
public BiomeConfig(ConfigurationNode node) { public BiomeConfig(ConfigurationNode node) {
this(node, null); this(node, null);
@ -46,7 +47,7 @@ public BiomeConfig(ConfigurationNode node) {
public BiomeConfig(ConfigurationNode node, ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader) { public BiomeConfig(ConfigurationNode node, ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader) {
this.autopoulationConfigLoader = autopoulationConfigLoader; this.autopoulationConfigLoader = autopoulationConfigLoader;
biomes = new HashMap<>(); biomes = new ConcurrentHashMap<>(200, 0.5f, 8);
for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){ for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){
String id = e.getKey().toString(); String id = e.getKey().toString();

10
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/BlockIdConfig.java
View File

@ -25,9 +25,11 @@
package de.bluecolored.bluemap.core.config; package de.bluecolored.bluemap.core.config;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import com.google.common.base.Preconditions;
import de.bluecolored.bluemap.core.logger.Logger; import de.bluecolored.bluemap.core.logger.Logger;
import de.bluecolored.bluemap.core.mca.mapping.BlockIdMapper; import de.bluecolored.bluemap.core.mca.mapping.BlockIdMapper;
@ -48,8 +50,8 @@ public BlockIdConfig(ConfigurationNode node) {
public BlockIdConfig(ConfigurationNode node, ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader) { public BlockIdConfig(ConfigurationNode node, ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader) {
this.autopoulationConfigLoader = autopoulationConfigLoader; this.autopoulationConfigLoader = autopoulationConfigLoader;
numeralMappings = new HashMap<>(); numeralMappings = new ConcurrentHashMap<>(200, 0.5f, 8);
idMappings = new HashMap<>(); idMappings = new ConcurrentHashMap<>(200, 0.5f, 8);
for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){ for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){
String key = e.getKey().toString(); String key = e.getKey().toString();
@ -135,7 +137,7 @@ public BlockState get(String id, int numeralId, int meta) {
} }
idMappings.put(idmeta, state); idMappings.put(idmeta, state);
numeralMappings.put(numidmeta, state); Preconditions.checkArgument(numeralMappings.put(numidmeta, state) == null);
if (autopoulationConfigLoader != null) { if (autopoulationConfigLoader != null) {
synchronized (autopoulationConfigLoader) { synchronized (autopoulationConfigLoader) {

3
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/BlockPropertiesConfig.java
View File

@ -33,6 +33,7 @@
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.MultimapBuilder; import com.google.common.collect.MultimapBuilder;
import com.google.common.collect.Multimaps;
import de.bluecolored.bluemap.core.logger.Logger; import de.bluecolored.bluemap.core.logger.Logger;
import de.bluecolored.bluemap.core.mca.mapping.BlockPropertiesMapper; import de.bluecolored.bluemap.core.mca.mapping.BlockPropertiesMapper;
@ -61,7 +62,7 @@ public BlockPropertiesConfig(ConfigurationNode node, ResourcePack resourcePack,
this.resourcePack = resourcePack; this.resourcePack = resourcePack;
this.autopoulationConfigLoader = autopoulationConfigLoader; this.autopoulationConfigLoader = autopoulationConfigLoader;
mappings = MultimapBuilder.hashKeys().arrayListValues().build(); mappings = Multimaps.synchronizedListMultimap(MultimapBuilder.hashKeys().arrayListValues().build());
for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){ for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){
String key = e.getKey().toString(); String key = e.getKey().toString();