Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-02 19:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Current Progress #3

Browse Source
This commit is contained in:
IronApollo
2019-01-09 02:13:44 -05:00
parent d4157b7e0e
commit 842b1307c7
221 changed files with 3173 additions and 3041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java
View File

@ -19,10 +19,7 @@
package com.sk89q.worldedit.util;
<<<<<<< HEAD
import com.sk89q.worldedit.*;
=======
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.Vector3;
@ -77,12 +74,7 @@ public class TargetBlock {
* @param viewHeight where the view is positioned in y-axis
* @param checkDistance how often to check for blocks, the smaller the more precise
*/
<<<<<<< HEAD
private void setValues(Vector loc, double xRotation, double yRotation,
int maxDistance, double viewHeight, double checkDistance) {
=======
private void setValues(Vector3 loc, double xRotation, double yRotation, int maxDistance, double viewHeight, double checkDistance) {
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
this.maxDistance = maxDistance;
this.checkDistance = checkDistance;
this.curDistance = 0;
@ -91,15 +83,9 @@ public class TargetBlock {
double h = (checkDistance * Math.cos(Math.toRadians(yRotation)));
<<<<<<< HEAD
offset = new Vector((h * Math.cos(Math.toRadians(xRotation))),
(checkDistance * Math.sin(Math.toRadians(yRotation))),
(h * Math.sin(Math.toRadians(xRotation))));
=======
offset = new Vector3((h * Math.cos(Math.toRadians(xRotation))),
(checkDistance * Math.sin(Math.toRadians(yRotation))),
(h * Math.sin(Math.toRadians(xRotation))));
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
targetPosDouble = loc.add(0, viewHeight, 0);
targetPos = targetPosDouble.toBlockPoint();
@ -116,11 +102,7 @@ public class TargetBlock {
boolean searchForLastBlock = true;
Location lastBlock = null;
while (getNextBlock() != null) {
<<<<<<< HEAD
if (world.getBlockType(getCurrentBlock().toVector()).getMaterial().isAir()) {
=======
if (world.getBlock(targetPos).getBlockType().getMaterial().isAir()) {
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
if (searchForLastBlock) {
lastBlock = getCurrentBlock();
if (lastBlock.getBlockY() <= 0 || lastBlock.getBlockY() >= world.getMaxY()) {
@ -142,11 +124,7 @@ public class TargetBlock {
* @return Block
*/
public Location getTargetBlock() {
<<<<<<< HEAD
while (getNextBlock() != null && world.getBlockType(getCurrentBlock().toVector()).getMaterial().isAir()) ;
=======
while (getNextBlock() != null && world.getBlock(targetPos).getBlockType().getMaterial().isAir()) ;
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
return getCurrentBlock();
}
@ -157,11 +135,7 @@ public class TargetBlock {
* @return Block
*/
public Location getSolidTargetBlock() {
<<<<<<< HEAD
while (getNextBlock() != null && !world.getBlockType(getCurrentBlock().toVector()).getMaterial().isMovementBlocker()) ;
=======
while (getNextBlock() != null && !world.getBlock(targetPos).getBlockType().getMaterial().isMovementBlocker()) ;
>>>>>>> 399e0ad5... Refactor vector system to be cleaner
return getCurrentBlock();
}