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

Cleanup

Browse Source
This commit is contained in:
Sotr
2018-06-11 22:16:10 +08:00
parent 6855fbe294
commit 559896e14b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.bukkit.Bukkit;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@@ -204,7 +203,7 @@ public abstract class MixinChunk implements IMixinChunk {
} }
} }
// this.isGapLightingUpdated = false; this.isGapLightingUpdated = false; // TODO
} }
} }

2
sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorld.java
View File

@@ -28,6 +28,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.server.BlockPosition; import net.minecraft.server.BlockPosition;
import net.minecraft.server.Chunk;
import net.minecraft.server.EnumSkyBlock; import net.minecraft.server.EnumSkyBlock;
import net.minecraft.server.IChunkProvider; import net.minecraft.server.IChunkProvider;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@@ -42,4 +43,5 @@ public abstract class MixinWorld {
@Shadow public abstract MinecraftServer getMinecraftServer(); @Shadow public abstract MinecraftServer getMinecraftServer();
@Shadow public abstract boolean areChunksLoaded(BlockPosition center, int radius, boolean allowEmpty); @Shadow public abstract boolean areChunksLoaded(BlockPosition center, int radius, boolean allowEmpty);
@Shadow(aliases = "m") public abstract void notifyLightSet(BlockPosition pos); @Shadow(aliases = "m") public abstract void notifyLightSet(BlockPosition pos);
@Shadow public abstract Chunk getChunkIfLoaded(int x, int z);
} }

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

@@ -42,6 +42,7 @@ import net.minecraft.server.EnumDirection;
import net.minecraft.server.EnumSkyBlock; import net.minecraft.server.EnumSkyBlock;
import net.minecraft.server.IBlockData; import net.minecraft.server.IBlockData;
import net.minecraft.server.MCUtil; import net.minecraft.server.MCUtil;
import net.minecraft.server.MathHelper;
import net.minecraft.server.WorldServer; import net.minecraft.server.WorldServer;
import net.minecraft.server.BlockPosition.PooledBlockPosition; import net.minecraft.server.BlockPosition.PooledBlockPosition;
@@ -97,7 +98,7 @@ public abstract class MixinWorldServer extends MixinWorld implements IMixinWorld
this.setLightForAsync(lightType, blockpos, 0, currentChunk, neighbors); // Sponge - use thread safe method this.setLightForAsync(lightType, blockpos, 0, currentChunk, neighbors); // Sponge - use thread safe method
if (l2 > 0) { if (l2 > 0) {
int j3 = Math.abs(i2 - i1); // TODO MathHelper int j3 = MathHelper.a(i2 - i1); // TODO MathHelper
int k3 = Math.abs(j2 - j1); int k3 = Math.abs(j2 - j1);
int l3 = Math.abs(k2 - k1); int l3 = Math.abs(k2 - k1);
@@ -188,7 +189,6 @@ public abstract class MixinWorldServer extends MixinWorld implements IMixinWorld
final IMixinChunk neighbor = (IMixinChunk) neighborChunk; final IMixinChunk neighbor = (IMixinChunk) neighborChunk;
neighbor.getPendingLightUpdates().decrementAndGet(); neighbor.getPendingLightUpdates().decrementAndGet();
} }
// Sponge end // Sponge end
return true; return true;
} }