TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 11:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #409 from Simplicitee/master

Browse source 
Fix WaterSpout
This commit is contained in:
OmniCypher 2016-02-17 16:53:47 -08:00
commit e572646f67
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
View file

@ -33,6 +33,8 @@ public class WaterSpout extends WaterAbility {
private double height;
private Block base;
private TempBlock baseBlock;
private boolean canFly;
private boolean hadFly;
public WaterSpout(Player player) {
super(player);
@ -48,7 +50,8 @@ public class WaterSpout extends WaterAbility {
this.useBlockSpiral = getConfig().getBoolean("Abilities.Water.WaterSpout.BlockSpiral");
this.height = getConfig().getDouble("Abilities.Water.WaterSpout.Height");
this.interval = getConfig().getLong("Abilities.Water.WaterSpout.Interval");
hadFly = player.isFlying();
canFly = player.getAllowFlight();
WaterSpoutWave spoutWave = new WaterSpoutWave(player, WaterSpoutWave.AbilityType.CLICK);
if (spoutWave.isStarted() && !spoutWave.isRemoved()) {
return;
@ -154,8 +157,8 @@ public class WaterSpout extends WaterAbility {
AFFECTED_BLOCKS.remove(tb.getBlock());
tb.revertBlock();
}
player.setAllowFlight(false);
player.setFlying(false);
player.setAllowFlight(canFly);
player.setFlying(hadFly);
}
public void revertBaseBlock() {
@ -252,17 +255,15 @@ public class WaterSpout extends WaterAbility {
public static boolean removeSpouts(Location loc0, double radius, Player sourcePlayer) {
boolean removed = false;
Location loc1 = sourcePlayer.getLocation().getBlock().getLocation();
loc0 = loc0.getBlock().getLocation();
double dx = loc1.getX() - loc0.getX();
double dy = loc1.getY() - loc0.getY();
double dz = loc1.getZ() - loc0.getZ();
double distSquared = dx * dx + dz * dz;
for (WaterSpout spout : getAbilities(sourcePlayer, WaterSpout.class)) {
if (distSquared <= radius * radius && dy > 0 && dy < spout.height) {
removed = true;
spout.remove();
Location top = spout.getLocation();
Location base = spout.getBase().getLocation();
for (double d = base.getY(); d <= top.getBlockY(); d += 0.25) {
Location spoutl = base.clone().add(0, d, 0);
if (loc0.distance(spoutl) <= radius) {
removed = true;
spout.remove();
}
}
}
return removed;