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

Fixes light calc

Browse Source
This commit is contained in:
Sotr
2018-06-11 22:35:54 +08:00
parent 559896e14b
commit 095a6e4d0b
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunk.java
View File

@@ -124,18 +124,14 @@ public abstract class MixinChunk implements IMixinChunk {
private void onTickHead(boolean skipRecheckGaps, CallbackInfo ci) { private void onTickHead(boolean skipRecheckGaps, CallbackInfo ci) {
final List<Chunk> neighbors = this.getSurroundingChunks(); final List<Chunk> neighbors = this.getSurroundingChunks();
if (this.isGapLightingUpdated && this.world.worldProvider.m() && !skipRecheckGaps && !neighbors.isEmpty()) { // PAIL: isGapLightingUpdated - hasSkyLight if (this.isGapLightingUpdated && this.world.worldProvider.m() && !skipRecheckGaps && !neighbors.isEmpty()) { // PAIL: isGapLightingUpdated - hasSkyLight
this.lightExecutorService.execute(() -> {
this.recheckGapsAsync(neighbors); this.recheckGapsAsync(neighbors);
});
this.isGapLightingUpdated = false; this.isGapLightingUpdated = false;
} }
this.ticked = true; this.ticked = true;
if (!this.isLightPopulated && this.isTerrainPopulated && !neighbors.isEmpty()) { if (!this.isLightPopulated && this.isTerrainPopulated && !neighbors.isEmpty()) {
this.lightExecutorService.execute(() -> {
this.checkLightAsync(neighbors); this.checkLightAsync(neighbors);
});
// set to true to avoid requeuing the same task when not finished // set to true to avoid requeuing the same task when not finished
this.isLightPopulated = true; this.isLightPopulated = true;
} }
@@ -203,7 +199,7 @@ public abstract class MixinChunk implements IMixinChunk {
} }
} }
this.isGapLightingUpdated = false; // TODO // this.isGapLightingUpdated = false;
} }
} }
@@ -232,7 +228,7 @@ public abstract class MixinChunk implements IMixinChunk {
@Inject(method = "o()V", at = @At("HEAD"), cancellable = true) @Inject(method = "o()V", at = @At("HEAD"), cancellable = true)
private void checkLightHead(CallbackInfo ci) { private void checkLightHead(CallbackInfo ci) {
if (this.world.getMinecraftServer().isStopped() || this.lightExecutorService.isShutdown()) { if (this.world.getMinecraftServer().isStopped()) {
return; return;
} }
@@ -247,13 +243,11 @@ public abstract class MixinChunk implements IMixinChunk {
if (Akari.isPrimaryThread()) { // Akarin if (Akari.isPrimaryThread()) { // Akarin
try { try {
this.lightExecutorService.execute(() -> {
this.checkLightAsync(neighborChunks); this.checkLightAsync(neighborChunks);
});
} catch (RejectedExecutionException ex) { } catch (RejectedExecutionException ex) {
// This could happen if ServerHangWatchdog kills the server // This could happen if ServerHangWatchdog kills the server
// between the start of the method and the execute() call. // between the start of the method and the execute() call.
if (!this.world.getMinecraftServer().isStopped() && !this.lightExecutorService.isShutdown()) { if (!this.world.getMinecraftServer().isStopped()) {
throw ex; throw ex;
} }
} }
@@ -451,9 +445,7 @@ public abstract class MixinChunk implements IMixinChunk {
@Inject(method = "c(III)V", at = @At("HEAD"), cancellable = true) @Inject(method = "c(III)V", at = @At("HEAD"), cancellable = true)
private void onRelightBlock(int x, int y, int z, CallbackInfo ci) { private void onRelightBlock(int x, int y, int z, CallbackInfo ci) {
this.lightExecutorService.execute(() -> {
this.relightBlockAsync(x, y, z); this.relightBlockAsync(x, y, z);
});
ci.cancel(); ci.cancel();
} }

4
sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorldServer.java
View File

@@ -99,8 +99,8 @@ public abstract class MixinWorldServer extends MixinWorld implements IMixinWorld
if (l2 > 0) { if (l2 > 0) {
int j3 = MathHelper.a(i2 - i1); // TODO MathHelper int j3 = MathHelper.a(i2 - i1); // TODO MathHelper
int k3 = Math.abs(j2 - j1); int k3 = MathHelper.a(j2 - j1);
int l3 = Math.abs(k2 - k1); int l3 = MathHelper.a(k2 - k1);
if (j3 + k3 + l3 < 17) { if (j3 + k3 + l3 < 17) {
PooledBlockPosition blockpos$pooledmutableblockpos = PooledBlockPosition.aquire(); PooledBlockPosition blockpos$pooledmutableblockpos = PooledBlockPosition.aquire();