TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-22 16:05:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #497 from StrangeOne101/master

Browse source 
Bug fixes
This commit is contained in:
OmniCypher 2016-06-06 22:04:08 -07:00
commit f6bc8bc87d
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -389,7 +389,8 @@ public class PKListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
Block block = event.getDamager();
if (block == null) return;
if (TempBlock.isTempBlock(block)) {
if (EarthAbility.isEarthbendable(block.getType()) && GeneralMethods.isSolid(block)) {
event.setCancelled(true);

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

@ -3,6 +3,7 @@ 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;
@ -164,6 +165,14 @@ public class FireBlast extends FireAbility {
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++;

7
src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java
View file

@ -2,6 +2,7 @@ package com.projectkorra.projectkorra.firebending;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.FireAbility;
import com.projectkorra.projectkorra.avatar.AvatarState;
import com.projectkorra.projectkorra.util.DamageHandler;
@ -233,7 +234,11 @@ public class FireBlastCharged extends FireAbility {
if (!bPlayer.canBendIgnoreBindsCooldowns(this) && !launched) {
remove();
return;
} else if (!player.isSneaking() && !charged) {
} else if (!bPlayer.canBend(CoreAbility.getAbility("FireBlast")) && !launched) {
remove();
return;
}
else if (!player.isSneaking() && !charged) {
remove();
return;
}

1
src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java
View file

@ -151,6 +151,7 @@ public class WaterArmsSpear extends WaterAbility {
progressSpear();
} else {
createIceBall();
remove();
}
if (layer >= spearSphere) {