Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1189 from T3hBrian/master

Browse Source 
Fix "null" and "#clipboard" argument failure for some brushes
This commit is contained in:
IronApollo 2018-11-08 01:21:17 -05:00 committed by GitHub
commit ba066847c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -745,7 +745,7 @@ public class BrushCommands extends BrushProcessor {
private BrushSettings terrainBrush(Player player, LocalSession session, Expression radius, String image, int rotation, double yscale, boolean flat, boolean randomRotate, boolean layers, boolean smooth, ScalableHeightMap.Shape shape, CommandContext context) throws WorldEditException, FileNotFoundException, ParameterException { private BrushSettings terrainBrush(Player player, LocalSession session, Expression radius, String image, int rotation, double yscale, boolean flat, boolean randomRotate, boolean layers, boolean smooth, ScalableHeightMap.Shape shape, CommandContext context) throws WorldEditException, FileNotFoundException, ParameterException {
checkMaxBrushRadius(radius); checkMaxBrushRadius(radius);
InputStream stream = image == null ? null : getHeightmapStream(image); InputStream stream = (image == null || image.equalsIgnoreCase("null") || image.equalsIgnoreCase("#clipboard")) ? null : getHeightmapStream(image);
HeightBrush brush; HeightBrush brush;
if (flat) { if (flat) {
try { try {