Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
IronApollo 2019-02-03 09:22:10 -05:00
parent 2d586ff53e
commit 0e5847e1ce
5 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -1939,14 +1939,6 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
final ForwardExtentCopy copy = new ForwardExtentCopy(EditSession.this, region, EditSession.this, to); final ForwardExtentCopy copy = new ForwardExtentCopy(EditSession.this, region, EditSession.this, to);
copy.setCopyingEntities(copyEntities); copy.setCopyingEntities(copyEntities);
copy.setCopyBiomes(copyBiomes); copy.setCopyBiomes(copyBiomes);
// public int stackCuboidRegion(Region region, BlockVector3 dir, int count, boolean copyAir) throws MaxChangedBlocksException {
// checkNotNull(region);
// checkNotNull(dir);
// checkArgument(count >= 1, "count >= 1 required");
//
// BlockVector3 size = region.getMaximumPoint().subtract(region.getMinimumPoint()).add(1, 1, 1);
// BlockVector3 to = region.getMinimumPoint();
// ForwardExtentCopy copy = new ForwardExtentCopy(this, region, this, to);
copy.setRepetitions(count); copy.setRepetitions(count);
copy.setTransform(new AffineTransform().translate(dir.multiply(size))); copy.setTransform(new AffineTransform().translate(dir.multiply(size)));
Mask sourceMask = getSourceMask(); Mask sourceMask = getSourceMask();

3
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/BlockCategoryPatternParser.java
View File

@ -26,6 +26,7 @@ import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern; import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.internal.registry.InputParser; import com.sk89q.worldedit.internal.registry.InputParser;
import com.sk89q.worldedit.world.block.BlockCategories;
import com.sk89q.worldedit.world.block.BlockCategory; import com.sk89q.worldedit.world.block.BlockCategory;
import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockType;
@ -48,7 +49,7 @@ public class BlockCategoryPatternParser extends InputParser<Pattern> {
if(!input.startsWith("##")) { if(!input.startsWith("##")) {
return null; return null;
} }
BlockCategory category = BlockCategory.REGISTRY.get(input.substring(2).toLowerCase()); BlockCategory category = BlockCategories.get(input.substring(2).toLowerCase());
if (category == null) { if (category == null) {
throw new InputParseException("Unknown block tag: " + input.substring(2)); throw new InputParseException("Unknown block tag: " + input.substring(2));
} }

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

@ -131,7 +131,6 @@ public class PasteBuilder {
if (ignoreAirBlocks) { if (ignoreAirBlocks) {
copy.setSourceMask(new ExistingBlockMask(clipboard)); copy.setSourceMask(new ExistingBlockMask(clipboard));
} }
System.out.println("PasteBuilder info: extent: " + extent.toString() + "; copy: " + copy + "; transform: " + transform);
return copy; return copy;
} }

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullBlockCategoryRegistry.java
View File

@ -36,9 +36,4 @@ public class NullBlockCategoryRegistry implements BlockCategoryRegistry {
public Set<BlockType> getAll(final Category<BlockType> category) { public Set<BlockType> getAll(final Category<BlockType> category) {
return Collections.emptySet(); return Collections.emptySet();
} }
@Override
public Set<String> getCategories(BlockType categorised) {
return Collections.emptySet();
}
} }

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/NullItemCategoryRegistry.java
View File

@ -36,9 +36,4 @@ public class NullItemCategoryRegistry implements ItemCategoryRegistry {
public Set<ItemType> getAll(final Category<ItemType> category) { public Set<ItemType> getAll(final Category<ItemType> category) {
return Collections.emptySet(); return Collections.emptySet();
} }
@Override
public Set<String> getCategories(ItemType categorised) {
return Collections.emptySet();
}
} }