Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-05 16:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverted to old manual lighting system that doesn't call notch's block lighting functions directly.

Browse Source
This commit is contained in:
TomyLobo 2011-10-29 04:29:57 +02:00
parent 8ce3f4d77a
commit 0ba3da2641
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
View File

@ -22,6 +22,9 @@ package com.sk89q.worldedit.bukkit;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.Furnace; import org.bukkit.block.Furnace;
@ -43,6 +46,7 @@ import org.bukkit.entity.Wolf;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.TreeType; import org.bukkit.TreeType;
@ -746,7 +750,7 @@ public class BukkitWorld extends LocalWorld {
@Override @Override
public void fixLighting(Iterable<BlockVector2D> chunks) { public void fixLighting(Iterable<BlockVector2D> chunks) {
if (fastLightingAvailable) { if (!fastLightingAvailable) {
return; return;
} }
@ -768,24 +772,41 @@ public class BukkitWorld extends LocalWorld {
// Fix blocklight // Fix blocklight
Chunk_blocklightMap.set(notchChunk, NibbleArray_ctor.newInstance(length, 7)); Chunk_blocklightMap.set(notchChunk, NibbleArray_ctor.newInstance(length, 7));
Chunk chunk = world.getChunkAt(chunkX, chunkZ);
List<BlockState> lightEmitters = new ArrayList<BlockState>();
for (int x = 0; x < chunkSizeX; ++x) { for (int x = 0; x < chunkSizeX; ++x) {
final boolean xBorder = x == 0 || x == chunkSizeX - 1; boolean xBorder = x == 0 || x == chunkSizeX - 1;
for (int z = 0; z < chunkSizeZ; ++z) { for (int z = 0; z < chunkSizeZ; ++z) {
final boolean zBorder = z == 0 || z == chunkSizeZ - 1; boolean zBorder = z == 0 || z == chunkSizeZ - 1;
for (int y = 0; y < chunkSizeY; ++y) { for (int y = 0; y < chunkSizeY; ++y) {
final int index = y + z * chunkSizeY + x * chunkSizeY * chunkSizeZ; final int index = y + z * chunkSizeY + x * chunkSizeY * chunkSizeZ;
final byte blockID = blocks[index]; byte blockID = blocks[index];
if (BlockType.emitsLight(blockID)) { if (!BlockType.emitsLight(blockID)) {
Chunk_relightBlock.invoke(notchChunk, x, y, z); if (xBorder || zBorder && BlockType.isTranslucent(blockID)) {
} lightEmitters.add(chunk.getBlock(x, y, z).getState());
else { if (blockID == 20) {
if ((xBorder || zBorder) && BlockType.isTranslucent(blockID)) { blocks[index] = 0;
Chunk_relightBlock.invoke(notchChunk, x, y, z); }
else {
blocks[index] = 20;
}
} }
continue;
} }
lightEmitters.add(chunk.getBlock(x, y, z).getState());
blocks[index] = 0;
} }
} }
} }
for (BlockState lightEmitter : lightEmitters) {
lightEmitter.update(true);
}
} }
} }
catch (Exception e) { catch (Exception e) {