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

Check Inner Distances

Browse source
This commit is contained in:
Vahagn Tovmasian 2020-07-20 21:19:45 -07:00
parent ac0618616c
commit ca426c67fa
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/com/projectkorra/projectkorra/airbending/AirBlast.java
View file

@ -206,12 +206,38 @@ public class AirBlast extends AirAbility {
if (this.random.nextInt(4) == 0) {
playAirbendingSound(this.location);
}
if (GeneralMethods.checkDiagonalWall(this.location, this.direction)) {
this.remove();
return;
for (double d = 0; d < speedFactor; d += 0.1) {
if (!checkLocation()) {
remove();
break;
}
this.location.add(this.direction.clone().multiply(d));
}
}
this.location = this.location.add(this.direction.clone().multiply(this.speedFactor));
public boolean checkLocation() {
if (GeneralMethods.checkDiagonalWall(this.location, this.direction)) {
this.remove();
return false;
}
Block block = location.getBlock();
if ((!block.isPassable() || block.isLiquid()) && !this.affectedLevers.contains(block)) {
if (block.getType() == Material.LAVA && this.canCoolLava) {
if (LavaFlow.isLavaFlowBlock(block)) {
LavaFlow.removeBlock(block); // TODO: Make more generic for future lava generating moves.
} else if (block.getBlockData() instanceof Levelled && ((Levelled) block.getBlockData()).getLevel() == 0) {
new TempBlock(block, Material.OBSIDIAN);
} else {
new TempBlock(block, Material.COBBLESTONE);
}
}
this.remove();
return false;
}
return true;
}
private void affect(final Entity entity) {
@ -400,20 +426,6 @@ public class AirBlast extends AirAbility {
}
}
if ((GeneralMethods.isSolid(block) || block.isLiquid()) && !this.affectedLevers.contains(block)) {
if (block.getType() == Material.LAVA && this.canCoolLava) {
if (LavaFlow.isLavaFlowBlock(block)) {
LavaFlow.removeBlock(block); // TODO: Make more generic for future lava generating moves.
} else if (block.getBlockData() instanceof Levelled && ((Levelled) block.getBlockData()).getLevel() == 0) {
new TempBlock(block, Material.OBSIDIAN);
} else {
new TempBlock(block, Material.COBBLESTONE);
}
}
this.remove();
return;
}
/*
* If a player presses shift and AirBlasts straight down then the
* AirBlast's location gets messed up and reading the distance returns