Small FireBlast Fix

This commit is contained in:
StrangeOne101 2016-06-09 12:06:47 +12:00
parent b80082c6ff
commit 9086ea2c01

View file

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