3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-20 01:40:06 +01:00
Dieser Commit ist enthalten in:
dordsor21 2024-06-09 19:43:11 +01:00
Ursprung a5b2a4e968
Commit da801ef3b1
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B
4 geänderte Dateien mit 3 neuen und 8 gelöschten Zeilen

Datei anzeigen

@ -1724,6 +1724,7 @@ public class LocalSession implements TextureHolder {
* @return an edit session * @return an edit session
*/ */
public EditSession createEditSession(Actor actor) { public EditSession createEditSession(Actor actor) {
//FAWE start
return createEditSession(actor, null); return createEditSession(actor, null);
} }
@ -1752,7 +1753,6 @@ public class LocalSession implements TextureHolder {
} }
// Create an edit session // Create an edit session
//FAWE start - we don't use the edit session builder yet
EditSession editSession; EditSession editSession;
EditSessionBuilder builder = WorldEdit.getInstance().newEditSessionBuilder().world(world); EditSessionBuilder builder = WorldEdit.getInstance().newEditSessionBuilder().world(world);
if (actor.isPlayer() && actor instanceof Player) { if (actor.isPlayer() && actor instanceof Player) {

Datei anzeigen

@ -40,6 +40,7 @@ public interface Brush {
*/ */
void build(EditSession editSession, BlockVector3 position, Pattern pattern, double size) throws MaxChangedBlocksException; void build(EditSession editSession, BlockVector3 position, Pattern pattern, double size) throws MaxChangedBlocksException;
//FAWE start
/** /**
* If this brush is expected to set blocks synchronously, i.e. from one thread (at a time) * If this brush is expected to set blocks synchronously, i.e. from one thread (at a time)
* *
@ -48,5 +49,6 @@ public interface Brush {
default boolean setsSynchronously() { default boolean setsSynchronously() {
return true; return true;
} }
//FAWE end
} }

Datei anzeigen

@ -361,11 +361,6 @@ public class AbstractDelegateExtent implements Extent {
public <T extends Filter> T apply(final Region region, final T filter, final boolean full) { public <T extends Filter> T apply(final Region region, final T filter, final boolean full) {
return extent.apply(region, filter, full); return extent.apply(region, filter, full);
} }
@Override
public <T extends Filter> T apply(final Iterable<BlockVector3> positions, final T filter) {
return extent.apply(positions, filter);
}
//FAWE end //FAWE end
protected Operation commitBefore() { protected Operation commitBefore() {

Datei anzeigen

@ -30,7 +30,6 @@ import com.fastasyncworldedit.core.queue.IChunk;
import com.fastasyncworldedit.core.queue.IChunkGet; import com.fastasyncworldedit.core.queue.IChunkGet;
import com.fastasyncworldedit.core.queue.IChunkSet; import com.fastasyncworldedit.core.queue.IChunkSet;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.function.mask.AbstractExtentMask;
import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeType;
@ -47,7 +46,6 @@ public class MaskingExtent extends AbstractDelegateExtent implements IBatchProce
//FAWE start //FAWE start
private final LongFunction<ChunkFilterBlock> getOrCreateFilterBlock; private final LongFunction<ChunkFilterBlock> getOrCreateFilterBlock;
private AbstractExtentMask extentMask;
private Mask mask; private Mask mask;
//FAWE end //FAWE end