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

Remove FireBlast Fire Correctly

Browse source
This commit is contained in:
Nathan Braun 2015-08-20 14:21:17 -07:00
parent fbbbe3346a
commit 6bf6dd4868
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/projectkorra/firebending/FireBlast.java
View file

@ -223,7 +223,9 @@ public class FireBlast extends CoreAbility {
private void ignite(Location location) { private void ignite(Location location) {
for (Block block : GeneralMethods.getBlocksAroundPoint(location, affectingradius)) { for (Block block : GeneralMethods.getBlocksAroundPoint(location, affectingradius)) {
if (FireStream.isIgnitable(player, block) && !safe.contains(block)) { if (FireStream.isIgnitable(player, block) && !safe.contains(block)) {
new Plantbending(block); if (WaterMethods.isPlantbendable(block)) {
new Plantbending(block);
}
block.setType(Material.FIRE); block.setType(Material.FIRE);
if (dissipate) { if (dissipate) {
FireStream.ignitedblocks.put(block, player); FireStream.ignitedblocks.put(block, player);

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

@ -307,6 +307,10 @@ public class WaterMethods {
return true; return true;
return false; return false;
} }
public static boolean isPlantbendable(Block block) {
return WaterMethods.isPlantbendable(block, false);
}
public static void playFocusWaterEffect(Block block) { public static void playFocusWaterEffect(Block block) {
block.getWorld().playEffect(block.getLocation(), Effect.SMOKE, 4, 20); block.getWorld().playEffect(block.getLocation(), Effect.SMOKE, 4, 20);