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

Merge pull request #64 from Carbogen/master

Browse source 
Fixed damage from MetalClips.
This commit is contained in:
MistPhizzle 2014-11-26 11:22:46 -05:00
commit 812138e1e1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/ProjectKorra/earthbending/MetalClips.java
View file

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Entity;
@ -404,8 +405,7 @@ public class MetalClips
if(System.currentTimeMillis() > time + crushInterval)
{
time = System.currentTimeMillis();
Methods.damageEntity(player, target, 0);
target.setHealth((target.getHealth() - crushDamage < 0) ? 0 : target.getHealth() - crushDamage);
Methods.damageEntity(player, target, (crushDamage + (crushDamage * 1.2)));
}
}
}