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

Fixed Airspout being able to be used after switching elements, also fixed being able to select multiple sources when using octopusform. (#506)

Browse source
This commit is contained in:
Jay Stannon 2016-06-27 04:05:58 +10:00 committed by OmniCypher
parent dd6bc984ba
commit 2907952ca2
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/com/projectkorra/projectkorra/airbending/AirSpout.java
View file

@ -1,15 +1,15 @@
package com.projectkorra.projectkorra.airbending; package com.projectkorra.projectkorra.airbending;
import com.projectkorra.projectkorra.GeneralMethods; import java.util.Random;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.util.Flight;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Random; import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.util.Flight;
public class AirSpout extends AirAbility { public class AirSpout extends AirAbility {
@ -87,6 +87,11 @@ public class AirSpout extends AirAbility {
remove(); remove();
return; return;
} }
if(!bPlayer.canBind(this)) {
remove();
return;
}
Block eyeBlock = player.getEyeLocation().getBlock(); Block eyeBlock = player.getEyeLocation().getBlock();
if (eyeBlock.isLiquid() || GeneralMethods.isSolid(eyeBlock)) { if (eyeBlock.isLiquid() || GeneralMethods.isSolid(eyeBlock)) {

4
src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
View file

@ -88,7 +88,9 @@ public class OctopusForm extends WaterAbility {
this.blocks = new ArrayList<TempBlock>(); this.blocks = new ArrayList<TempBlock>();
this.newBlocks = new ArrayList<TempBlock>(); this.newBlocks = new ArrayList<TempBlock>();
this.time = System.currentTimeMillis(); this.time = System.currentTimeMillis();
this.sourceBlock = BlockSource.getWaterSourceBlock(player, range, ClickType.LEFT_CLICK, true, true, bPlayer.canPlantbend()); if(!player.isSneaking()) {
this.sourceBlock = BlockSource.getWaterSourceBlock(player, range, ClickType.LEFT_CLICK, true, true, bPlayer.canPlantbend());
}
if (sourceBlock != null) { if (sourceBlock != null) {
sourceLocation = sourceBlock.getLocation(); sourceLocation = sourceBlock.getLocation();