Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-03 07:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: require extent for mask parsing (#1373)

Browse Source 
(cherry picked from commit 1ced57c301bc1c98667a260fd8b6aa128675f0d2)
This commit is contained in:
Matthew Miller 2020-06-24 03:50:32 -04:00 committed by MattBDev
parent c0bfe06e4b
commit 39439fb405
8 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BiomeMaskParser.java
View File

@ -77,6 +77,6 @@ public class BiomeMaskParser extends InputParser<Mask> {
biomes.add(biome); biomes.add(biome);
} }
return Masks.asMask(new BiomeMask2D(context.getExtent(), biomes)); return Masks.asMask(new BiomeMask2D(context.requireExtent(), biomes));
} }
} }

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockCategoryMaskParser.java
View File

@ -53,7 +53,7 @@ public class BlockCategoryMaskParser extends InputParser<Mask> {
if (category == null) { if (category == null) {
throw new InputParseException("Unrecognised tag '" + input.substring(2) + '\''); throw new InputParseException("Unrecognised tag '" + input.substring(2) + '\'');
} else { } else {
return new BlockCategoryMask(context.getExtent(), category); return new BlockCategoryMask(context.requireExtent(), category);
} }
} }
} }

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlockStateMaskParser.java
View File

@ -52,7 +52,7 @@ public class BlockStateMaskParser extends InputParser<Mask> {
boolean strict = input.charAt(1) == '='; boolean strict = input.charAt(1) == '=';
String states = input.substring(2 + (strict ? 1 : 0), input.length() - 1); String states = input.substring(2 + (strict ? 1 : 0), input.length() - 1);
try { try {
return new BlockStateMask(context.getExtent(), return new BlockStateMask(context.requireExtent(),
Splitter.on(',').omitEmptyStrings().trimResults().withKeyValueSeparator('=').split(states), Splitter.on(',').omitEmptyStrings().trimResults().withKeyValueSeparator('=').split(states),
strict); strict);
} catch (Exception e) { } catch (Exception e) {

4
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/BlocksMaskParser.java
View File

@ -55,8 +55,8 @@ public class BlocksMaskParser extends InputParser<Mask> {
if (holders.isEmpty()) { if (holders.isEmpty()) {
return null; return null;
} }
return new BlockMask(context.getExtent(), holders); return new BlockMask(context.requireExtent(), holders);
} catch (InputParseException e) { } catch (NoMatchException e) {
return null; return null;
} }
} }

5
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ExistingMaskParser.java
View File

@ -21,6 +21,7 @@ package com.sk89q.worldedit.extension.factory.parser.mask;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.ExistingBlockMask; import com.sk89q.worldedit.function.mask.ExistingBlockMask;
import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.Mask;
@ -42,7 +43,7 @@ public class ExistingMaskParser extends SimpleInputParser<Mask> {
} }
@Override @Override
public Mask parseFromSimpleInput(String input, ParserContext context) { public Mask parseFromSimpleInput(String input, ParserContext context) throws InputParseException {
return new ExistingBlockMask(context.getExtent()); return new ExistingBlockMask(context.requireExtent());
} }
} }

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ExpressionMaskParser.java
View File

@ -57,7 +57,7 @@ public class ExpressionMaskParser extends InputParser<Mask> {
try { try {
Expression exp = Expression.compile(input.substring(1), "x", "y", "z"); Expression exp = Expression.compile(input.substring(1), "x", "y", "z");
WorldEditExpressionEnvironment env = new WorldEditExpressionEnvironment( WorldEditExpressionEnvironment env = new WorldEditExpressionEnvironment(
context.getExtent(), Vector3.ONE, Vector3.ZERO); context.requireExtent(), Vector3.ONE, Vector3.ZERO);
exp.setEnvironment(env); exp.setEnvironment(env);
if (context.getActor() != null) { if (context.getActor() != null) {
SessionOwner owner = context.getActor(); SessionOwner owner = context.getActor();

2
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/OffsetMaskParser.java
View File

@ -61,7 +61,7 @@ public class OffsetMaskParser extends InputParser<Mask> {
if (input.length() > 1) { if (input.length() > 1) {
submask = worldEdit.getMaskFactory().parseFromInput(input.substring(1), context); submask = worldEdit.getMaskFactory().parseFromInput(input.substring(1), context);
} else { } else {
submask = new ExistingBlockMask(context.getExtent()); submask = new ExistingBlockMask(context.requireExtent());
} }
OffsetMask offsetMask = new OffsetMask(submask, BlockVector3.at(0, firstChar == '>' ? -1 : 1, 0)); OffsetMask offsetMask = new OffsetMask(submask, BlockVector3.at(0, firstChar == '>' ? -1 : 1, 0));
return new MaskIntersection(offsetMask, Masks.negate(submask)); return new MaskIntersection(offsetMask, Masks.negate(submask));

5
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/SolidMaskParser.java
View File

@ -21,6 +21,7 @@ package com.sk89q.worldedit.extension.factory.parser.mask;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.mask.SolidBlockMask; import com.sk89q.worldedit.function.mask.SolidBlockMask;
@ -42,7 +43,7 @@ public class SolidMaskParser extends SimpleInputParser<Mask> {
} }
@Override @Override
public Mask parseFromSimpleInput(String input, ParserContext context) { public Mask parseFromSimpleInput(String input, ParserContext context) throws InputParseException {
return new SolidBlockMask(context.getExtent()); return new SolidBlockMask(context.requireExtent());
} }
} }