Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-10-01 07:57:41 +02:00
Code Issues Projects Releases Wiki Activity

Use of a lock object to synchronize instance entities collections

Browse Source
This commit is contained in:
Felix Cravic 2020-11-22 22:18:47 +01:00
parent a8c1c73282
commit e09397a0e2
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/instance/Chunk.java
View File

@ -186,7 +186,7 @@ public abstract class Chunk implements Viewable, DataContainer {
* @param z the block Z
* @param data the new data, can be null
*/
public abstract void setBlockData(int x, int y, int z, Data data);
public abstract void setBlockData(int x, int y, int z, @Nullable Data data);
/**
* Gets all the block entities in this chunk.

12
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -1,6 +1,7 @@
package net.minestom.server.instance;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import net.minestom.server.MinecraftServer;
import net.minestom.server.UpdateManager;
@ -81,7 +82,8 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
protected final Set<ObjectEntity> objectEntities = new CopyOnWriteArraySet<>();
protected final Set<ExperienceOrb> experienceOrbs = new CopyOnWriteArraySet<>();
// Entities per chunk
protected final Long2ObjectMap<Set<Entity>> chunkEntities = new Long2ObjectOpenHashMap<>();
protected final Long2ObjectMap<Set<Entity>> chunkEntities = Long2ObjectMaps.synchronize(new Long2ObjectOpenHashMap<>());
private Object entitiesLock = new Object(); // Lock used to prevent the entities Set and Map to be subject to race condition
// the uuid of this instance
protected UUID uniqueId;
@ -921,7 +923,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
"The chunk " + chunk + " is not loaded, you can make it automatic by using Instance#enableAutoChunkLoad(true)");
Check.argCondition(!chunk.isLoaded(), "Chunk " + chunk + " has been unloaded previously");
final long chunkIndex = ChunkUtils.getChunkIndex(chunk.getChunkX(), chunk.getChunkZ());
synchronized (chunkEntities) {
synchronized (entitiesLock) {
Set<Entity> entities = getEntitiesInChunk(chunkIndex);
entities.add(entity);
this.chunkEntities.put(chunkIndex, entities);
@ -948,7 +950,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
* @param chunk the chunk where the entity will be removed
*/
public void removeEntityFromChunk(@NotNull Entity entity, @NotNull Chunk chunk) {
synchronized (chunkEntities) {
synchronized (entitiesLock) {
final long chunkIndex = ChunkUtils.getChunkIndex(chunk.getChunkX(), chunk.getChunkZ());
Set<Entity> entities = getEntitiesInChunk(chunkIndex);
entities.remove(entity);
@ -973,9 +975,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
@NotNull
private Set<Entity> getEntitiesInChunk(long index) {
synchronized (chunkEntities) {
return chunkEntities.computeIfAbsent(index, i -> new CopyOnWriteArraySet<>());
}
return chunkEntities.computeIfAbsent(index, i -> new CopyOnWriteArraySet<>());
}
/**

6
src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -313,7 +313,7 @@ public class InstanceContainer extends Instance {
*
* @param blockPosition the position of the modified block
*/
private void executeNeighboursBlockPlacementRule(BlockPosition blockPosition) {
private void executeNeighboursBlockPlacementRule(@NotNull BlockPosition blockPosition) {
for (int offsetX = -1; offsetX < 2; offsetX++) {
for (int offsetY = -1; offsetY < 2; offsetY++) {
for (int offsetZ = -1; offsetZ < 2; offsetZ++) {
@ -827,9 +827,7 @@ public class InstanceContainer extends Instance {
// Clear cache
this.chunks.remove(index);
synchronized (chunkEntities) {
this.chunkEntities.remove(index);
}
this.chunkEntities.remove(index);
chunk.unload();