TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-08-16 16:37:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #460 from Simplicitee/master

Browse source 
Fix armor issues
This commit is contained in:
OmniCypher 2016-03-28 20:39:16 -07:00
parent 1c1cfdf9a8 b251971e2f
commit 1f005973df
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
View file

@ -4,6 +4,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
import com.projectkorra.projectkorra.waterbending.PlantArmor;
import org.bukkit.Location;
import org.bukkit.Material;
@ -42,6 +43,11 @@ public class EarthArmor extends EarthAbility {
return;
}
if (hasAbility(player, PlantArmor.class)) {
PlantArmor abil = getAbility(player, PlantArmor.class);
abil.remove();
}
this.formed = false;
this.complete = false;
this.interval = 2000;

1
src/com/projectkorra/projectkorra/earthbending/Shockwave.java
View file

@ -37,6 +37,7 @@ public class Shockwave extends EarthAbility {
if (fall) {
fallShockwave();
return;
}
start();

8
src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
View file

@ -2,6 +2,7 @@ package com.projectkorra.projectkorra.waterbending;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.PlantAbility;
import com.projectkorra.projectkorra.earthbending.EarthArmor;
import org.bukkit.Color;
import org.bukkit.Location;
@ -43,10 +44,15 @@ public class PlantArmor extends PlantAbility {
if (hasAbility(player, PlantArmor.class)) {
return;
} else if (bPlayer.isOnCooldown(this)) {
} else if (!bPlayer.canBend(this)) {
return;
}
if (hasAbility(player, EarthArmor.class)) {
EarthArmor abil = getAbility(player, EarthArmor.class);
abil.remove();
}
block = getPlantSourceBlock(player, range, true);
if (block == null) {
return;