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

Don't cache location for circle brush, fix #970

Browse Source 
Also, allow filled circles (very cool feature)
This commit is contained in:
Hannes Greule 2021-04-10 01:07:51 +02:00
parent 911d3a00eb
commit 19592df1f6
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
worldedit-core/src/main/java/com/boydti/fawe/object/brush/CircleBrush.java
View File

@ -10,16 +10,22 @@ import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.math.transform.AffineTransform; import com.sk89q.worldedit.math.transform.AffineTransform;
public class CircleBrush implements Brush { public class CircleBrush implements Brush {
private final Player player;
public CircleBrush(Player player) { private final boolean filled;
this.player = player;
public CircleBrush(boolean filled) {
this.filled = filled;
} }
@Override @Override
public void build(EditSession editSession, BlockVector3 position, Pattern pattern, double size) throws MaxChangedBlocksException { public void build(EditSession editSession, BlockVector3 position, Pattern pattern, double size) throws MaxChangedBlocksException {
Player player = editSession.getPlayer();
if (player == null) {
return;
}
Vector3 normal = position.toVector3().subtract(player.getLocation()); Vector3 normal = position.toVector3().subtract(player.getLocation());
editSession.makeCircle(position, pattern, size, size, size, false, normal); editSession.makeCircle(position, pattern, size, size, size, filled, normal);
} }
private Vector3 any90Rotate(Vector3 normal) { private Vector3 any90Rotate(Vector3 normal) {

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

@ -1985,8 +1985,6 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
double threshold = 0.5; double threshold = 0.5;
LocalBlockVectorSet set = new LocalBlockVectorSet();
double nextXn = 0; double nextXn = 0;
double dx; double dx;
double dy; double dy;

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

@ -221,13 +221,16 @@ public class BrushCommands {
desc = "Creates a circle, which revolves around your facing direction" desc = "Creates a circle, which revolves around your facing direction"
) )
@CommandPermissions("worldedit.brush.sphere") @CommandPermissions("worldedit.brush.sphere")
public void circleBrush(Player player, InjectedValueAccess context, public void circleBrush(InjectedValueAccess context,
@Arg(desc = "Pattern") @Arg(desc = "Pattern")
Pattern fill, Pattern fill,
@Arg(desc = "The radius to sample for blending", def = "5") @Arg(desc = "The radius to sample for blending", def = "5")
Expression radius) throws WorldEditException { Expression radius,
@Arg(name = "filled", desc = "Whether the circle should be filled", def = "false")
boolean filled
) throws WorldEditException {
worldEdit.checkMaxBrushRadius(radius); worldEdit.checkMaxBrushRadius(radius);
set(context, new CircleBrush(player)).setSize(radius).setFill(fill); set(context, new CircleBrush(filled)).setSize(radius).setFill(fill);
} }
@Command( @Command(