diff --git a/core/src/main/java/com/seibel/lod/core/file/datafile/DataMetaFile.java b/core/src/main/java/com/seibel/lod/core/file/datafile/DataMetaFile.java index a9a4e1eba..65bd29511 100644 --- a/core/src/main/java/com/seibel/lod/core/file/datafile/DataMetaFile.java +++ b/core/src/main/java/com/seibel/lod/core/file/datafile/DataMetaFile.java @@ -316,7 +316,7 @@ public class DataMetaFile extends AbstractMetaDataFile private boolean applyWriteQueue(ILodDataSource data) { // Poll the write queue // First check if write queue is empty, then swap the write queue. - // Must be done in this order to ensure isValid work properly. See isValid() for details. + // Must be done in this order to ensure isMemoryAddressValid work properly. See isMemoryAddressValid() for details. boolean isEmpty = writeQueue.get().queue.isEmpty(); if (!isEmpty) { swapWriteQueue(); diff --git a/core/src/main/java/com/seibel/lod/core/file/datafile/GeneratedDataFileHandler.java b/core/src/main/java/com/seibel/lod/core/file/datafile/GeneratedDataFileHandler.java index 9eefbe2ca..dff0ef2e4 100644 --- a/core/src/main/java/com/seibel/lod/core/file/datafile/GeneratedDataFileHandler.java +++ b/core/src/main/java/com/seibel/lod/core/file/datafile/GeneratedDataFileHandler.java @@ -155,7 +155,7 @@ public class GeneratedDataFileHandler extends DataFileHandler @Override - public boolean isValid() { return this.targetData.get() != null; } + public boolean isMemoryAddressValid() { return this.targetData.get() != null; } @Override public Consumer getConsumer() diff --git a/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java index e7f1d98a2..47076a4dd 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java +++ b/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java @@ -368,7 +368,7 @@ public class WorldGenerationQueue implements Closeable while (taskIter.hasNext()) { WorldGenTask task = taskIter.next(); - if (!task.taskTracker.isValid()) + if (!task.taskTracker.isMemoryAddressValid()) { taskIter.remove(); task.future.complete(false); diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java b/core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java index 4e5e53dfb..d580235b1 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java +++ b/core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java @@ -14,7 +14,7 @@ public abstract class AbstractWorldGenTaskTracker * Returns true if the task hasn't been garbage collected.
* TODO rename to fit the above description better */ - public abstract boolean isValid(); + public abstract boolean isMemoryAddressValid(); public abstract Consumer getConsumer(); diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java b/core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java index f6ef2bc23..ed26aaf5e 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java +++ b/core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java @@ -39,7 +39,7 @@ public class SplitTaskTracker extends AbstractWorldGenTaskTracker return false; } - this.isValid = this.parentTracker.isValid(); + this.isValid = this.parentTracker.isMemoryAddressValid(); if (!this.isValid) { this.parentFuture.complete(false); @@ -49,7 +49,7 @@ public class SplitTaskTracker extends AbstractWorldGenTaskTracker } @Override - public boolean isValid() { return this.isValid; } + public boolean isMemoryAddressValid() { return this.isValid; } @Override public Consumer getConsumer() { return this.parentTracker.getConsumer(); }