geforkt von Mirrors/FastAsyncWorldEdit
Fix lighting 1.14
Dieser Commit ist enthalten in:
Ursprung
ee54dcd809
Commit
913ada31fb
1
.gitignore
vendored
1
.gitignore
vendored
@ -23,3 +23,4 @@ worldedit-bukkit/src/main/java/ignore/*
|
|||||||
todo.txt
|
todo.txt
|
||||||
mvn/*
|
mvn/*
|
||||||
docs/
|
docs/
|
||||||
|
*.sh
|
||||||
|
@ -14,6 +14,7 @@ import com.boydti.fawe.bukkit.adapter.mc1_14.nbt.LazyCompoundTag_1_14;
|
|||||||
import com.boydti.fawe.object.collection.AdaptedMap;
|
import com.boydti.fawe.object.collection.AdaptedMap;
|
||||||
import com.boydti.fawe.object.collection.BitArray4096;
|
import com.boydti.fawe.object.collection.BitArray4096;
|
||||||
import com.boydti.fawe.util.ReflectionUtils;
|
import com.boydti.fawe.util.ReflectionUtils;
|
||||||
|
import com.boydti.fawe.util.TaskManager;
|
||||||
import com.google.common.base.Suppliers;
|
import com.google.common.base.Suppliers;
|
||||||
import com.google.common.collect.Iterables;
|
import com.google.common.collect.Iterables;
|
||||||
import com.sk89q.jnbt.CompoundTag;
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
@ -41,11 +42,13 @@ import java.util.UUID;
|
|||||||
import java.util.concurrent.Callable;
|
import java.util.concurrent.Callable;
|
||||||
import java.util.concurrent.Future;
|
import java.util.concurrent.Future;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
import java.util.function.Supplier;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
import net.minecraft.server.v1_14_R1.BiomeBase;
|
import net.minecraft.server.v1_14_R1.BiomeBase;
|
||||||
import net.minecraft.server.v1_14_R1.BlockPosition;
|
import net.minecraft.server.v1_14_R1.BlockPosition;
|
||||||
import net.minecraft.server.v1_14_R1.Chunk;
|
import net.minecraft.server.v1_14_R1.Chunk;
|
||||||
import net.minecraft.server.v1_14_R1.ChunkSection;
|
import net.minecraft.server.v1_14_R1.ChunkSection;
|
||||||
|
import net.minecraft.server.v1_14_R1.ChunkStatus;
|
||||||
import net.minecraft.server.v1_14_R1.DataBits;
|
import net.minecraft.server.v1_14_R1.DataBits;
|
||||||
import net.minecraft.server.v1_14_R1.DataPalette;
|
import net.minecraft.server.v1_14_R1.DataPalette;
|
||||||
import net.minecraft.server.v1_14_R1.DataPaletteBlock;
|
import net.minecraft.server.v1_14_R1.DataPaletteBlock;
|
||||||
@ -54,6 +57,8 @@ import net.minecraft.server.v1_14_R1.DataPaletteLinear;
|
|||||||
import net.minecraft.server.v1_14_R1.Entity;
|
import net.minecraft.server.v1_14_R1.Entity;
|
||||||
import net.minecraft.server.v1_14_R1.EntityTypes;
|
import net.minecraft.server.v1_14_R1.EntityTypes;
|
||||||
import net.minecraft.server.v1_14_R1.IBlockData;
|
import net.minecraft.server.v1_14_R1.IBlockData;
|
||||||
|
import net.minecraft.server.v1_14_R1.LightEngine;
|
||||||
|
import net.minecraft.server.v1_14_R1.LightEngineThreaded;
|
||||||
import net.minecraft.server.v1_14_R1.NBTTagCompound;
|
import net.minecraft.server.v1_14_R1.NBTTagCompound;
|
||||||
import net.minecraft.server.v1_14_R1.NBTTagInt;
|
import net.minecraft.server.v1_14_R1.NBTTagInt;
|
||||||
import net.minecraft.server.v1_14_R1.TileEntity;
|
import net.minecraft.server.v1_14_R1.TileEntity;
|
||||||
@ -444,12 +449,11 @@ public class BukkitGetBlocks_1_14 extends CharGetBlocks {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// {//Lighting
|
{//Lighting
|
||||||
// for (int layer = 0; layer < 16; layer++) {
|
// TODO optimize, cause this is really slow
|
||||||
// if (!set.hasSection(layer)) continue;
|
LightEngineThreaded engine = (LightEngineThreaded) nmsChunk.e();
|
||||||
// //TODO lighting
|
engine.a(nmsChunk, false);
|
||||||
// }
|
}
|
||||||
// }
|
|
||||||
|
|
||||||
Runnable callback;
|
Runnable callback;
|
||||||
if (bitMask == 0 && biomes == null) {
|
if (bitMask == 0 && biomes == null) {
|
||||||
|
@ -192,7 +192,7 @@ public class BukkitWorld extends AbstractWorld {
|
|||||||
public boolean regenerate(Region region, EditSession editSession) {
|
public boolean regenerate(Region region, EditSession editSession) {
|
||||||
BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
|
BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
|
||||||
if (adapter != null) {
|
if (adapter != null) {
|
||||||
return adapter.regenerate(getWorld(), region, editSession);
|
return adapter.regenerate(getWorld(), region, null, null, editSession);
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
BaseBlock[] history = new BaseBlock[16 * 16 * (getMaxY() + 1)];
|
BaseBlock[] history = new BaseBlock[16 * 16 * (getMaxY() + 1)];
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren