TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-01-10 08:57:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #499 from StrangeOne101/master

Browse source 
Small FireBlast Fix
This commit is contained in:
OmniCypher 2016-06-09 15:47:02 -07:00 committed by GitHub
commit 1fee3bcdf8
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package com.projectkorra.projectkorra.firebending;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.avatar.AvatarState;
@ -159,20 +158,12 @@ public class FireBlast extends FireAbility {
@Override
public void progress() {
if (!bPlayer.canBendIgnoreBindsCooldowns(this)
if (!bPlayer.canBendIgnoreCooldowns(this)
|| GeneralMethods.isRegionProtectedFromBuild(this, location)) {
remove();
return;
}
if (isFireBurst && !bPlayer.canBend(CoreAbility.getAbility("FireBurst"))) {
remove();
return;
} else if (!isFireBurst && !bPlayer.canBend(CoreAbility.getAbility("FireBlast"))) {
remove();
return;
}
speedFactor = speed * (ProjectKorra.time_step / 1000.0);
ticks++;