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

Change hcyl default thickness

Browse Source
This commit is contained in:
Jesse Boyd 2017-08-24 12:07:51 +10:00
parent ce19c2026b
commit 920095a2de
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/boydti/fawe/object/mask/AngleMask.java
View File

@ -55,7 +55,7 @@ public class AngleMask extends SolidBlockMask implements ResettableMask {
private transient boolean lastValue; private transient boolean lastValue;
public int getHeight(int x, int y, int z) { public int getHeight(int x, int y, int z) {
return lastY = getExtent().getNearestSurfaceTerrainBlock(x, z, y, 0, maxY); return getExtent().getNearestSurfaceTerrainBlock(x, z, y, 0, maxY);
// try { // try {
// int rx = x - cacheBotX + 16; // int rx = x - cacheBotX + 16;
// int rz = z - cacheBotZ + 16; // int rz = z - cacheBotZ + 16;

8
core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java
View File

@ -184,13 +184,13 @@ public class GenerationCommands extends MethodCommands {
) )
@CommandPermissions("worldedit.generation.cylinder") @CommandPermissions("worldedit.generation.cylinder")
@Logging(PLACEMENT) @Logging(PLACEMENT)
public void hcyl(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector2D radius, @Optional("1") int height, @Optional("1") int thickness, CommandContext context) throws WorldEditException, ParameterException { public void hcyl(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector2D radius, @Optional("1") int height, @Range(min = 1) @Optional("1") int thickness, CommandContext context) throws WorldEditException, ParameterException {
double max = MathMan.max(radius.getBlockX(), radius.getBlockZ()); double max = MathMan.max(radius.getBlockX(), radius.getBlockZ());
worldEdit.checkMaxBrushRadius(max); worldEdit.checkMaxBrushRadius(max);
fp.checkConfirmationRadius(getArguments(context), (int) max); fp.checkConfirmationRadius(getArguments(context), (int) max);
height = Math.min(256, height); height = Math.min(256, height);
Vector pos = session.getPlacementPosition(player); Vector pos = session.getPlacementPosition(player);
int affected = editSession.makeHollowCylinder(pos, pattern, radius.getBlockX(), radius.getBlockZ(), height, thickness); int affected = editSession.makeHollowCylinder(pos, pattern, radius.getBlockX(), radius.getBlockZ(), height, thickness - 1);
BBC.VISITOR_BLOCK.send(fp, affected); BBC.VISITOR_BLOCK.send(fp, affected);
} }
@ -211,7 +211,7 @@ public class GenerationCommands extends MethodCommands {
@Logging(PLACEMENT) @Logging(PLACEMENT)
public void cyl(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector2D radius, @Optional("1") int height, @Switch('h') boolean hollow, CommandContext context) throws WorldEditException, ParameterException { public void cyl(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector2D radius, @Optional("1") int height, @Switch('h') boolean hollow, CommandContext context) throws WorldEditException, ParameterException {
double max = MathMan.max(radius.getBlockX(), radius.getBlockZ()); double max = MathMan.max(radius.getBlockX(), radius.getBlockZ());
worldEdit.checkMaxBrushRadius(max); worldEdit.checkMaxRadius(max);
fp.checkConfirmationRadius(getArguments(context), (int) max); fp.checkConfirmationRadius(getArguments(context), (int) max);
height = Math.min(256, height); height = Math.min(256, height);
Vector pos = session.getPlacementPosition(player); Vector pos = session.getPlacementPosition(player);
@ -254,7 +254,7 @@ public class GenerationCommands extends MethodCommands {
@Logging(PLACEMENT) @Logging(PLACEMENT)
public void sphere(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector radius, @Optional("false") boolean raised, @Switch('h') boolean hollow, CommandContext context) throws WorldEditException, ParameterException { public void sphere(FawePlayer fp, Player player, LocalSession session, EditSession editSession, Pattern pattern, Vector radius, @Optional("false") boolean raised, @Switch('h') boolean hollow, CommandContext context) throws WorldEditException, ParameterException {
double max = MathMan.max(radius.getBlockX(), radius.getBlockY(), radius.getBlockZ()); double max = MathMan.max(radius.getBlockX(), radius.getBlockY(), radius.getBlockZ());
worldEdit.checkMaxBrushRadius(max); worldEdit.checkMaxRadius(max);
fp.checkConfirmationRadius(getArguments(context), (int) max); fp.checkConfirmationRadius(getArguments(context), (int) max);
Vector pos = session.getPlacementPosition(player); Vector pos = session.getPlacementPosition(player);