Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-01 05:58:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix concurrent modify exception.

Browse Source
This commit is contained in:
Eoghanmc22 2020-08-13 18:50:57 -04:00
parent cc01a48cf1
commit d12618af0f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/thread/PerGroupChunkProvider.java
View File

@ -109,9 +109,7 @@ public class PerGroupChunkProvider extends ThreadProvider {
ArrayList<Future<?>> futures = new ArrayList<>();
instanceInstanceMap.entrySet().forEach(entry -> {
final Instance instance = entry.getKey();
final Map<LongSet, Instance> instanceMap = entry.getValue();
instanceInstanceMap.forEach((instance, instanceMap) -> {
// True if the instance ended its tick call
AtomicBoolean instanceUpdated = new AtomicBoolean(false);
@ -157,7 +155,7 @@ public class PerGroupChunkProvider extends ThreadProvider {
}
private Map<LongSet, Instance> getInstanceMap(Instance instance) {
return instanceInstanceMap.computeIfAbsent(instance, inst -> new HashMap<>());
return instanceInstanceMap.computeIfAbsent(instance, inst -> new ConcurrentHashMap<>());
}
}

8
src/main/java/net/minestom/server/utils/MathUtils.java
View File

@ -70,4 +70,12 @@ public final class MathUtils {
public static float setBetween(float number, float min, float max) {
return number > max ? max : number < min ? min : number;
}
public static int clamp(int value, int min, int max) {
if (value < min) {
return min;
} else {
return Math.min(value, max);
}
}
}