Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2025-02-12 18:41:26 +01:00
Code Issues Projects Releases Wiki Activity

Brushes target solid blocks

Browse Source
This commit is contained in:
Jesse Boyd 2017-04-21 04:43:27 +10:00
parent 36a093eb5f
commit ac5d5de394
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java
View File

@ -34,6 +34,7 @@ import com.sk89q.worldedit.function.mask.MaskIntersection;
import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.session.request.Request; import com.sk89q.worldedit.session.request.Request;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.TargetBlock;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -244,7 +245,7 @@ public class BrushTool implements DoubleActionTraceTool, ScrollTool, MovableTool
public Vector getPosition(EditSession editSession, Player player) { public Vector getPosition(EditSession editSession, Player player) {
switch (targetMode) { switch (targetMode) {
case TARGET_BLOCK_RANGE: case TARGET_BLOCK_RANGE:
return new MutableBlockVector(player.getBlockTrace(getRange(), true)); return new MutableBlockVector(trace(player, getRange(), true));
case FOWARD_POINT_PITCH: { case FOWARD_POINT_PITCH: {
int d = 0; int d = 0;
Location loc = player.getLocation(); Location loc = player.getLocation();
@ -268,15 +269,20 @@ public class BrushTool implements DoubleActionTraceTool, ScrollTool, MovableTool
} }
} }
final int distance = (height - y) + 8; final int distance = (height - y) + 8;
return new MutableBlockVector(player.getBlockTrace(distance, true)); return new MutableBlockVector(trace(player, distance, true));
} }
case TARGET_FACE_RANGE: case TARGET_FACE_RANGE:
return new MutableBlockVector(player.getBlockTraceFace(getRange(), true)); return new MutableBlockVector(trace(player, getRange(), true));
default: default:
return null; return null;
} }
} }
private Vector trace(Player player, int range, boolean useLastBlock) {
TargetBlock tb = new TargetBlock(player, range, 0.2);
return (useLastBlock ? tb.getSolidTargetBlock() : tb.getTargetBlock());
}
public boolean act(BrushAction action, Platform server, LocalConfiguration config, Player player, LocalSession session) { public boolean act(BrushAction action, Platform server, LocalConfiguration config, Player player, LocalSession session) {
switch (action) { switch (action) {
case PRIMARY: case PRIMARY: