CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chunk meta

Browse Source
This commit is contained in:
okx-code
2024-03-26 14:59:38 +00:00
parent 9bddcdec84
commit 26e5acb93b
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java
View File

@@ -12,15 +12,16 @@ public abstract class TableBasedBlockChunkMeta<D extends TableBasedDataObject>
extends BlockBasedChunkMeta<TableBasedDataObject, TableStorageEngine<D>> {
private static final Logger CHUNK_META_LOGGER = LogManager.getLogger("Chunk meta");
private List<D> modifiedEntries;
private final List<D> modifiedEntries = new ArrayList<>();
public TableBasedBlockChunkMeta(boolean isNew, TableStorageEngine<D> storage) {
super(isNew, storage);
this.modifiedEntries = new ArrayList<>();
}
public void reportChange(D data) {
modifiedEntries.add(data);
synchronized (modifiedEntries) {
modifiedEntries.add(data);
}
}
@SuppressWarnings("unchecked")
@@ -28,7 +29,9 @@ public abstract class TableBasedBlockChunkMeta<D extends TableBasedDataObject>
public void put(int x, int y, int z, TableBasedDataObject blockData, boolean isNew) {
super.put(x, y, z, blockData, isNew);
if (isNew) {
modifiedEntries.add((D) blockData);
synchronized (modifiedEntries) {
modifiedEntries.add((D) blockData);
}
}
}
@@ -40,7 +43,9 @@ public abstract class TableBasedBlockChunkMeta<D extends TableBasedDataObject>
//this may look weird, but is what happens if the data was NEW previously, never written to the
//db and doesn't need to be deleted from there either
if (blockData.getCacheState() != CacheState.NORMAL) {
modifiedEntries.add((D) blockData);
synchronized (modifiedEntries) {
modifiedEntries.add((D) blockData);
}
}
}
@@ -56,7 +61,12 @@ public abstract class TableBasedBlockChunkMeta<D extends TableBasedDataObject>
@Override
public void insert() {
CHUNK_META_LOGGER.debug("Inserting at " + chunkCoord);
for (D data : modifiedEntries) {
List<D> datas;
synchronized (modifiedEntries) {
datas = new ArrayList<>(modifiedEntries);
modifiedEntries.clear();
}
for (D data : datas) {
switch (data.getCacheState()) {
case NORMAL:
continue;
@@ -71,7 +81,6 @@ public abstract class TableBasedBlockChunkMeta<D extends TableBasedDataObject>
}
data.setCacheState(CacheState.NORMAL);
}
modifiedEntries.clear();
}
@SuppressWarnings("unchecked")