Update from sk89q/master

This commit is contained in:
Jesse Boyd
2018-09-03 00:10:38 +10:00
59 changed files with 231 additions and 200 deletions

View File

@ -47,6 +47,7 @@ import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
import com.sk89q.worldedit.function.mask.ExistingBlockMask;
import com.sk89q.worldedit.function.mask.Mask;
import com.sk89q.worldedit.function.mask.SingleBlockTypeMask;
import com.sk89q.worldedit.function.pattern.BlockPattern;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.internal.expression.Expression;
import com.sk89q.worldedit.session.ClipboardHolder;

View File

@ -428,7 +428,7 @@ public class RegionCommands extends MethodCommands {
@Logging(REGION)
public void walls(FawePlayer player, EditSession editSession, @Selection Region region, Pattern pattern, CommandContext context) throws WorldEditException {
player.checkConfirmationRegion(getArguments(context), region);
int affected = editSession.makeCuboidWalls(region, pattern);
int affected = editSession.makeWalls(region, pattern);
BBC.VISITOR_BLOCK.send(player, affected);
}

View File

@ -27,5 +27,5 @@ import com.sk89q.worldedit.util.Location;
public interface BlockTool extends Tool {
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked);
boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked);
}

View File

@ -30,6 +30,6 @@ import com.sk89q.worldedit.util.Location;
*/
public interface DoubleActionBlockTool extends BlockTool {
public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked);
boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked);
}

View File

@ -29,6 +29,6 @@ import com.sk89q.worldedit.extension.platform.Platform;
*/
public interface DoubleActionTraceTool extends TraceTool {
public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session);
boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session);
}

View File

@ -31,7 +31,6 @@ import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
/**
* A tool that can place (or remove) blocks at a distance.

View File

@ -34,6 +34,6 @@ public interface Tool {
* @param actor the actor
* @return true if use is permitted
*/
public boolean canUse(Actor actor);
boolean canUse(Actor actor);
}

View File

@ -26,5 +26,5 @@ import com.sk89q.worldedit.extension.platform.Platform;
public interface TraceTool extends Tool {
public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session);
boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session);
}

View File

@ -39,6 +39,6 @@ public interface Brush {
* @param size the size of the brush
* @throws MaxChangedBlocksException
*/
public void build(EditSession editSession, Vector position, Pattern pattern, double size) throws WorldEditException;
void build(EditSession editSession, Vector position, Pattern pattern, double size) throws WorldEditException;
}