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

Remove WaterSpout if Bloodbended / Paralyzed

Browse source
This commit is contained in:
MistPhizzle 2014-07-24 22:33:06 -04:00
parent 94fe066aa9
commit d1b6497fe6
1 changed files with 46 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java
View file

@ -10,6 +10,8 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
import chiblocking.Paralyze;
import com.projectkorra.ProjectKorra.Flight;
import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra;
@ -32,9 +34,9 @@ public class WaterSpout {
private TempBlock baseblock;
public WaterSpout(Player player) {
// if (BendingPlayer.getBendingPlayer(player).isOnCooldown(
// Abilities.WaterSpout))
// return;
// if (BendingPlayer.getBendingPlayer(player).isOnCooldown(
// Abilities.WaterSpout))
// return;
if (instances.containsKey(player)) {
instances.get(player).remove();
@ -101,6 +103,10 @@ public class WaterSpout {
public static void spout(Player player) {
WaterSpout spout = instances.get(player);
if (Bloodbending.isBloodbended(player) || Paralyze.isParalyzed(player)) {
instances.get(player).remove();
} else {
player.setFallDistance(0);
player.setSprinting(false);
// if (player.getVelocity().length() > threshold) {
@ -140,6 +146,7 @@ public class WaterSpout {
instances.get(player).remove();
}
}
}
private static int spoutableWaterHeight(Location location, Player player) {
WaterSpout spout = instances.get(player);