Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-18 01:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sometimes an overlay position may not be able to be found. Attempt to resolve or fail nicely.

Browse Source
This commit is contained in:
dordsor21 2021-09-28 14:39:14 +01:00
parent a3365a12bc
commit fa2f50dea8
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ScatterOverlayBrush.java
View File

@ -1,6 +1,7 @@
package com.fastasyncworldedit.core.command.tool.brush; package com.fastasyncworldedit.core.command.tool.brush;
import com.fastasyncworldedit.core.math.LocalBlockVectorSet; import com.fastasyncworldedit.core.math.LocalBlockVectorSet;
import com.fastasyncworldedit.core.math.MutableBlockVector3;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
@ -15,10 +16,27 @@ public class ScatterOverlayBrush extends ScatterBrush {
@Override @Override
public void apply(EditSession editSession, LocalBlockVectorSet placed, BlockVector3 pt, Pattern p, double size) throws public void apply(EditSession editSession, LocalBlockVectorSet placed, BlockVector3 pt, Pattern p, double size) throws
MaxChangedBlocksException { MaxChangedBlocksException {
int x = pt.getBlockX(); final int x = pt.getBlockX();
int y = pt.getBlockY(); final int y = pt.getBlockY();
int z = pt.getBlockZ(); final int z = pt.getBlockZ();
BlockVector3 dir = getDirection(pt); BlockVector3 dir = getDirection(pt);
if (dir == null) {
getDir:
{
MutableBlockVector3 mut = new MutableBlockVector3(pt);
for (int yy = 0; yy < size; yy++) {
if ((dir = getDirection(mut.mutY(y + yy))) != null) {
break getDir;
}
}
for (int yy = 0; yy > -size; yy--) {
if ((dir = getDirection(mut.mutY(y - yy))) != null) {
break getDir;
}
}
return;
}
}
editSession.setBlock(x + dir.getBlockX(), y + dir.getBlockY(), z + dir.getBlockZ(), p); editSession.setBlock(x + dir.getBlockX(), y + dir.getBlockY(), z + dir.getBlockZ(), p);
} }