conflicts

This commit is contained in:
Jesse Boyd
2019-08-07 01:25:53 +10:00
parent accc62c10b
commit b6bc09226c
4 changed files with 113 additions and 108 deletions

View File

@ -52,7 +52,6 @@ import com.sk89q.worldedit.registry.state.PropertyGroup;
import com.sk89q.worldedit.session.ClipboardHolder;
import com.sk89q.worldedit.util.Countable;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
@ -65,6 +64,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
import static com.google.common.base.Preconditions.checkNotNull;
@ -136,6 +136,15 @@ public interface Extent extends InputExtent, OutputExtent {
return null;
}
/**
* Create an entity at the given location.
*
* @param entity the entity
* @param location the location
* @return a reference to the created entity, or null if the entity could not be created
*/
default @Nullable void removeEntity(int x, int y, int z, UUID uuid) {}
/*
Queue based methods
TODO NOT IMPLEMENTED:
@ -620,8 +629,4 @@ public interface Extent extends InputExtent, OutputExtent {
return count;
}
default World getWorld() {
return null;
}
}