TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix for Distance Bug in EarthGrab

Browse source
This commit is contained in:
Christopher Martin 2016-10-14 21:34:17 -07:00 committed by GitHub
parent 3c41c611b9
commit d35ce755b0
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/com/projectkorra/projectkorra/earthbending/EarthGrab.java
View file

@ -30,7 +30,6 @@ public class EarthGrab extends EarthAbility {
private Vector dir; private Vector dir;
private Block groundBlock; private Block groundBlock;
private Material blockType; private Material blockType;
private Byte blockByte;
private Random random; private Random random;
public EarthGrab(Player player) { public EarthGrab(Player player) {
@ -45,7 +44,7 @@ public class EarthGrab extends EarthAbility {
this.closestEntity = null; this.closestEntity = null;
this.startLoc = player.getLocation(); this.startLoc = player.getLocation();
this.loc = player.getLocation(); this.loc = player.getLocation();
this.dir = player.getLocation().getDirection().clone().normalize().multiply(1.5); this.dir = player.getLocation().getDirection();
this.random = new Random(); this.random = new Random();
if (!bPlayer.canBend(this)) { if (!bPlayer.canBend(this)) {
@ -53,13 +52,12 @@ public class EarthGrab extends EarthAbility {
} }
if(player.isSneaking()) { if(player.isSneaking()) {
start(); start();
} else { }
Location targetLocation = GeneralMethods.getTargetedLocation(player, 1); Location targetLocation = GeneralMethods.getTargetedLocation(player, 1);
Block block = GeneralMethods.getTopBlock(targetLocation, 1, 1); Block block = GeneralMethods.getTopBlock(targetLocation, 1);
if(isEarthbendable(block) && block.getLocation().distance(player.getLocation()) <= 1.3) { if(isEarthbendable(block) && block.getWorld().equals(player.getWorld()) && block.getLocation().distance(player.getLocation()) <= 2) {
earthGrabSelf(); earthGrabSelf();
remove(); remove();
}
} }
} }
@ -115,7 +113,7 @@ public class EarthGrab extends EarthAbility {
closestEntity = player; closestEntity = player;
getGround(); getGround();
ParticleEffect.BLOCK_CRACK.display( ParticleEffect.BLOCK_CRACK.display(
(ParticleEffect.ParticleData) new ParticleEffect.BlockData(blockType, blockByte), 1F, 1F, 1F, (ParticleEffect.ParticleData) new ParticleEffect.BlockData(blockType, (byte) 0), 1F, 1F, 1F,
0.1F, 100, player.getLocation(), 500); 0.1F, 100, player.getLocation(), 500);
if (closestEntity != null) { if (closestEntity != null) {
ArrayList<Block> blocks = new ArrayList<Block>(); ArrayList<Block> blocks = new ArrayList<Block>();
@ -168,14 +166,12 @@ public class EarthGrab extends EarthAbility {
return "EarthGrab"; return "EarthGrab";
} }
@SuppressWarnings("deprecation")
private void getGround() { private void getGround() {
for (int i = 0; i <= 5; i++) { for (int i = 0; i <= 5; i++) {
Block block = loc.getBlock().getRelative(BlockFace.DOWN, i); Block block = loc.getBlock().getRelative(BlockFace.DOWN, i);
if (isEarthbendable(block)) { if (isEarthbendable(block)) {
groundBlock = block; groundBlock = block;
blockType = block.getType(); blockType = block.getType();
blockByte = block.getData();
return; return;
} }
} }
@ -189,7 +185,7 @@ public class EarthGrab extends EarthAbility {
remove(); remove();
return; return;
} }
dir = dir.clone().normalize().multiply(1.5); dir = player.getLocation().getDirection().clone().normalize().multiply(1.5);
dir.setY(0); dir.setY(0);
double distance = loc.getY() - (double) groundBlock.getY(); double distance = loc.getY() - (double) groundBlock.getY();
double dx = Math.abs(distance - 2.4); double dx = Math.abs(distance - 2.4);
@ -202,7 +198,7 @@ public class EarthGrab extends EarthAbility {
} }
loc.add(dir); loc.add(dir);
ParticleEffect.BLOCK_CRACK.display( ParticleEffect.BLOCK_CRACK.display(
(ParticleEffect.ParticleData) new ParticleEffect.BlockData(blockType, blockByte), 1F, 0.1F, 1F, (ParticleEffect.ParticleData) new ParticleEffect.BlockData(blockType, (byte) 0), 1F, 0.1F, 1F,
0.1F, 100, loc.add(0, -1, 0), 500); 0.1F, 100, loc.add(0, -1, 0), 500);
if(player.isDead() || !player.isOnline()) { if(player.isDead() || !player.isOnline()) {
remove(); remove();
@ -212,7 +208,7 @@ public class EarthGrab extends EarthAbility {
remove(); remove();
return; return;
} }
if(loc.distance(startLoc) >= selectRange) { if(loc.getWorld().equals(startLoc.getWorld()) && loc.distance(startLoc) >= selectRange) {
remove(); remove();
return; return;
} }
@ -302,4 +298,4 @@ public class EarthGrab extends EarthAbility {
this.cooldown = cooldown; this.cooldown = cooldown;
} }
} }