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

85
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.entity.Player;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import chiblocking.Paralyze;
import com.projectkorra.ProjectKorra.Flight; import com.projectkorra.ProjectKorra.Flight;
import com.projectkorra.ProjectKorra.Methods; import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra; import com.projectkorra.ProjectKorra.ProjectKorra;
@ -32,9 +34,9 @@ public class WaterSpout {
private TempBlock baseblock; private TempBlock baseblock;
public WaterSpout(Player player) { public WaterSpout(Player player) {
// if (BendingPlayer.getBendingPlayer(player).isOnCooldown( // if (BendingPlayer.getBendingPlayer(player).isOnCooldown(
// Abilities.WaterSpout)) // Abilities.WaterSpout))
// return; // return;
if (instances.containsKey(player)) { if (instances.containsKey(player)) {
instances.get(player).remove(); instances.get(player).remove();
@ -101,43 +103,48 @@ public class WaterSpout {
public static void spout(Player player) { public static void spout(Player player) {
WaterSpout spout = instances.get(player); WaterSpout spout = instances.get(player);
player.setFallDistance(0); if (Bloodbending.isBloodbended(player) || Paralyze.isParalyzed(player)) {
player.setSprinting(false);
// if (player.getVelocity().length() > threshold) {
// // Methods.verbose("Too fast!");
// player.setVelocity(player.getVelocity().clone().normalize()
// .multiply(threshold * .5));
// }
player.removePotionEffect(PotionEffectType.SPEED);
Location location = player.getLocation().clone().add(0, .2, 0);
Block block = location.clone().getBlock();
int height = spoutableWaterHeight(location, player);
// Methods.verbose(height + " " + WaterSpout.height + " "
// + affectedblocks.size());
if (height != -1) {
location = spout.base.getLocation();
for (int i = 1; i <= height; i++) {
block = location.clone().add(0, i, 0).getBlock();
if (!TempBlock.isTempBlock(block)) {
new TempBlock(block, Material.STATIONARY_WATER, (byte) 8);
}
// block.setType(Material.WATER);
// block.setData(full);
if (!affectedblocks.containsKey(block)) {
affectedblocks.put(block, block);
}
newaffectedblocks.put(block, block);
}
if (player.getLocation().getBlockY() > block.getY()) {
player.setFlying(false);
} else {
new Flight(player);
player.setAllowFlight(true);
player.setFlying(true);
}
} else {
instances.get(player).remove(); instances.get(player).remove();
} else {
player.setFallDistance(0);
player.setSprinting(false);
// if (player.getVelocity().length() > threshold) {
// // Methods.verbose("Too fast!");
// player.setVelocity(player.getVelocity().clone().normalize()
// .multiply(threshold * .5));
// }
player.removePotionEffect(PotionEffectType.SPEED);
Location location = player.getLocation().clone().add(0, .2, 0);
Block block = location.clone().getBlock();
int height = spoutableWaterHeight(location, player);
// Methods.verbose(height + " " + WaterSpout.height + " "
// + affectedblocks.size());
if (height != -1) {
location = spout.base.getLocation();
for (int i = 1; i <= height; i++) {
block = location.clone().add(0, i, 0).getBlock();
if (!TempBlock.isTempBlock(block)) {
new TempBlock(block, Material.STATIONARY_WATER, (byte) 8);
}
// block.setType(Material.WATER);
// block.setData(full);
if (!affectedblocks.containsKey(block)) {
affectedblocks.put(block, block);
}
newaffectedblocks.put(block, block);
}
if (player.getLocation().getBlockY() > block.getY()) {
player.setFlying(false);
} else {
new Flight(player);
player.setAllowFlight(true);
player.setFlying(true);
}
} else {
instances.get(player).remove();
}
} }
} }