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

Fix Waterwave

Browse source
This commit is contained in:
OmniCypher 2015-09-20 15:12:45 -07:00
parent 91aa8dcdd2
commit c9e98eb53f
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/util/BlockSource.java
View file

@ -226,7 +226,7 @@ public class BlockSource {
// Check the block in front of the player's eyes, it may have been created by a
// WaterBottle.
sourceBlock = WaterMethods.getWaterSourceBlock(player, range, allowPlant);
if (sourceBlock == null || sourceBlock.getLocation().distance(player.getEyeLocation()) > 3) {
if (sourceBlock == null) {
sourceBlock = null;
}
}

16
src/com/projectkorra/projectkorra/waterbending/WaterWave.java
View file

@ -8,6 +8,7 @@ import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.TempBlock;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
@ -100,13 +101,15 @@ public class WaterWave {
if (type == AbilityType.CLICK) {
if (origin == null) {
removeType(player, AbilityType.CLICK);
instances.add(this);
Block block = BlockSource.getWaterSourceBlock(player, range, ClickType.LEFT_CLICK, true, true, WaterMethods.canPlantbend(player));
if (block == null) {
remove();
if(instances.contains(this)) {
remove();
}
return;
}
instances.add(this);
Block blockAbove = block.getRelative(BlockFace.UP);
if (blockAbove.getType() != Material.AIR && !WaterMethods.isWaterbendable(blockAbove, player)) {
remove();
@ -136,19 +139,22 @@ public class WaterWave {
direction = player.getEyeLocation().getDirection();
}
if (!charging) {
if (!containsType(player, AbilityType.CLICK)) {
if (!containsType(player, AbilityType.SHIFT)) {
removeType(player, AbilityType.CLICK);
remove();
return;
}
//removeType(player, AbilityType.CLICK);
charging = true;
anim = AnimateState.RISE;
if(!getType(player, AbilityType.CLICK).isEmpty()) {
WaterWave clickSpear = getType(player, AbilityType.CLICK).get(0);
origin = clickSpear.origin.clone();
currentLoc = origin.clone();
if (WaterMethods.isPlant(origin.getBlock()))
new Plantbending(origin.getBlock());
}
}
@ -164,7 +170,7 @@ public class WaterWave {
}
double animSpeed = 1.2;
if (anim == AnimateState.RISE) {
if (anim == AnimateState.RISE && currentLoc != null) {
revertBlocks();
currentLoc.add(0, animSpeed, 0);
Block block = currentLoc.getBlock();