Repo-Mirror/MoonriseMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Add TickThread check to ServerChunkCache#getChunkNow

Browse Source 
We shouldn't be using the currently loading chunk unless
we are on the main thread.
This commit is contained in:
Spottedleaf
2024-08-14 12:17:46 -07:00
parent fc9d35c4b0
commit 763fb751cb
4 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/LevelMixin.java
View File

@@ -199,7 +199,7 @@ abstract class LevelMixin implements ChunkSystemLevel, ChunkSystemEntityGetter,
@Override
public LevelChunk moonrise$getFullChunkIfLoaded(final int chunkX, final int chunkZ) {
return this.getChunkSource().getChunk(chunkX, chunkZ, false);
return (LevelChunk)this.getChunkSource().getChunk(chunkX, chunkZ, ChunkStatus.FULL, false);
}
@Override

8
src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ServerChunkCacheMixin.java
View File

@@ -106,8 +106,10 @@ abstract class ServerChunkCacheMixin extends ChunkSource implements ChunkSystemS
return ifPresent;
}
if (currentChunk != null) {
final ChunkAccess loading = PlatformHooks.get().getCurrentlyLoadingChunk(currentChunk.vanillaChunkHolder);
final PlatformHooks platformHooks = PlatformHooks.get();
if (platformHooks.hasCurrentlyLoadingChunk() && currentChunk != null) {
final ChunkAccess loading = platformHooks.getCurrentlyLoadingChunk(currentChunk.vanillaChunkHolder);
if (loading != null && TickThread.isTickThread()) {
return loading;
}
@@ -149,7 +151,7 @@ abstract class ServerChunkCacheMixin extends ChunkSource implements ChunkSystemS
return ret;
}
if (ret != null) {
if (ret != null || !TickThread.isTickThread()) {
return ret;
}

1
src/main/java/ca/spottedleaf/moonrise/mixin/collisions/ExplosionMixin.java
View File

@@ -437,7 +437,6 @@ abstract class ExplosionMixin {
}
final double diameter = (double)this.radius * 2.0;
// use null predicate to avoid indirection on test(), but we need to move the spectator check into the loop itself
final List<Entity> entities = this.level.getEntities(this.source,
new AABB(
(double)Mth.floor(this.x - (diameter + 1.0)),

18
src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
View File

@@ -1119,24 +1119,6 @@ public final class NewChunkHolder {
private static final long CHUNK_LOADED_MASK_RAD1 = getLoadedMask(1);
private static final long CHUNK_LOADED_MASK_RAD2 = getLoadedMask(2);
public static boolean areNeighboursFullLoaded(final long bitset, final int radius) {
switch (radius) {
case 0: {
return (bitset & CHUNK_LOADED_MASK_RAD0) == CHUNK_LOADED_MASK_RAD0;
}
case 1: {
return (bitset & CHUNK_LOADED_MASK_RAD1) == CHUNK_LOADED_MASK_RAD1;
}
case 2: {
return (bitset & CHUNK_LOADED_MASK_RAD2) == CHUNK_LOADED_MASK_RAD2;
}
default: {
throw new IllegalArgumentException("Radius not recognized: " + radius);
}
}
}
// only updated while holding scheduling lock
private FullChunkStatus pendingFullChunkStatus = FullChunkStatus.INACCESSIBLE;
// updated while holding no locks, but adds a ticket before to prevent pending status from dropping