Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile

Browse Source
This commit is contained in:
Jesse Boyd
2018-08-16 00:04:16 +10:00
parent be574391ed
commit 659ed09bf1
8 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-core/src/main/java/com/boydti/fawe/object/pattern/ExistingPattern.java
View File

@ -6,6 +6,7 @@ import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
public class ExistingPattern extends AbstractExtentPattern {
public ExistingPattern(Extent extent) {
@ -19,7 +20,7 @@ public class ExistingPattern extends AbstractExtentPattern {
@Override
public boolean apply(Extent extent, Vector set, Vector get) throws WorldEditException {
if (set.getBlockX() == get.getBlockX() && set.getBlockZ() == get.getBlockZ() && set.getBlockY() == get.getBlockY()) {
if (set.equals(get)) {
return false;
}
return extent.setBlock(set, extent.getBlock(get));

2
worldedit-core/src/main/java/com/boydti/fawe/util/MathMan.java
View File

@ -353,7 +353,7 @@ public class MathMan {
return x;
}
public static final boolean isInteger(String str) {
public static final boolean isInteger(CharSequence str) {
if (str == null) {
return false;
}

1
worldedit-core/src/main/java/com/sk89q/worldedit/Vector.java
View File

@ -818,6 +818,7 @@ public class Vector extends Vector2D implements Comparable<Vector>, Serializable
@Override
public boolean equals(Object obj) {
if (obj == this) return true;
if (!(obj instanceof Vector)) {
return false;
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java
View File

@ -139,7 +139,6 @@ public class BlockMask extends AbstractExtentMask {
if (other instanceof SingleBlockTypeMask) {
return new BlockMaskBuilder(bitSets).filter(((SingleBlockTypeMask) other).getBlockType()).build(getExtent());
}
// TODO FIXME BlockTypeMask
return null;
}
@ -164,7 +163,6 @@ public class BlockMask extends AbstractExtentMask {
if (other instanceof SingleBlockTypeMask) {
return new BlockMaskBuilder(bitSets).add(((SingleBlockTypeMask) other).getBlockType()).build(getExtent());
}
// TODO FIXME BlockTypeMask
return null;
}

1
worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java
View File

@ -56,7 +56,6 @@ public class YAMLConfiguration extends LocalConfiguration {
logger.log(Level.WARNING, "Error loading WorldEdit configuration", e);
}
// TODO FIXME use Config class with comments / bindings
profile = config.getBoolean("debug", profile);
wandItem = ItemTypes.parse(config.getString("wand-item", wandItem.getId()));