Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-18 01:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

I hope these are the last few errors

Browse Source
This commit is contained in:
MattBDev 2019-10-03 20:27:19 -04:00
parent f963e63f58
commit 51a5c22677
6 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
import com.sk89q.worldedit.entity.BaseEntity;
@ -37,7 +36,6 @@ import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.util.Direction;
import com.sk89q.worldedit.util.TreeGenerator;
import com.sk89q.worldedit.world.AbstractWorld;
import com.sk89q.worldedit.world.biome.BiomeType;
@ -495,6 +493,12 @@ public class BukkitWorld extends AbstractWorld {
return BukkitAdapter.adapt(getWorld().getBiome(position.getBlockX(), position.getBlockZ()));
}
@Override
public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block)
throws WorldEditException {
return setBlock(BlockVector3.at(x,y,z), block);
}
@Override
public boolean setTile(int x, int y, int z, CompoundTag tile) throws WorldEditException {
return false;
@ -506,6 +510,11 @@ public class BukkitWorld extends AbstractWorld {
return true;
}
@Override
public boolean setBiome(int x, int y, int z, BiomeType biome) {
return setBiome(BlockVector2.at(x,z), biome);
}
@Override
public void sendChunk(int X, int Z, int mask) {
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Actor.java
View File

@ -84,7 +84,7 @@ public interface Actor extends Identifiable, SessionOwner, Subject, Metadatable
*/
void print(Component component);
/**F
/**
* Returns true if the actor can destroy bedrock.
*
* @return true if bedrock can be broken by the actor

10
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ABlockMask.java
View File

@ -21,16 +21,12 @@ public abstract class ABlockMask extends AbstractExtentMask {
List<String> strings = new ArrayList<>();
for (BlockType type : BlockTypes.values) {
if (type != null) {
boolean hasAll = true;
boolean hasAny = false;
boolean hasAll;
List<BlockState> all = type.getAllStates();
for (BlockState state : all) {
hasAll &= test(state);
hasAny = true;
}
hasAll = all.stream().map(this::test).reduce(true, (a, b) -> a && b);
if (hasAll) {
strings.add(type.getId());
} else if (hasAny) {
} else {
for (BlockState state : all) {
if (test(state)) {
strings.add(state.getAsString());

16
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/Mask.java
View File

@ -81,15 +81,15 @@ public interface Mask {
return value == null ? this : value;
}
default Mask and(Mask other) {
Mask value = and(other);
return value == null ? new MaskIntersection(this, other) : value;
}
// default Mask and(Mask other) {
// Mask value = and(other);
// return value == null ? new MaskIntersection(this, other) : value;
// }
default Mask or(Mask other) {
Mask value = or(other);
return value == null ? new MaskUnion(this, other) : value;
}
// default Mask or(Mask other) {
// Mask value = or(other);
// return value == null ? new MaskUnion(this, other) : value;
// }
default Mask inverse() {
if (this instanceof Masks.AlwaysTrue) {

14
worldedit-core/src/main/java/com/sk89q/worldedit/session/request/RequestExtent.java
View File

@ -34,9 +34,8 @@ import com.sk89q.worldedit.world.biome.BiomeType;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import javax.annotation.Nullable;
import java.util.List;
import javax.annotation.Nullable;
public class RequestExtent implements Extent {
@ -96,6 +95,12 @@ public class RequestExtent implements Extent {
return getExtent().setBlock(position, block);
}
@Override
public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block)
throws WorldEditException {
return getExtent().setBlock(x, y, z, block);
}
@Override
public boolean setTile(int x, int y, int z, CompoundTag tile) throws WorldEditException {
return getExtent().setTile(x, y, z, tile);
@ -106,6 +111,11 @@ public class RequestExtent implements Extent {
return getExtent().setBiome(position, biome);
}
@Override
public boolean setBiome(int x, int y, int z, BiomeType biome) {
return getExtent().setBiome(BlockVector2.at(x,z), biome);
}
@Override
@Nullable
public Operation commit() {

9
worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
View File

@ -87,11 +87,20 @@ public class NullWorld extends AbstractWorld {
return false;
}
@Override
public BiomeType getBiome(BlockVector2 position) {
return BiomeTypes.THE_VOID;
}
@Override
public BiomeType getBiomeType(int x, int z) {
return BiomeTypes.THE_VOID;
}
@Override
public boolean setBiome(BlockVector2 position, BiomeType biome) {
return false;
}
@Override
public boolean setBiome(int x, int y, int z, BiomeType biome) {
return false;