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 #418 from jedk1/master

Browse source 
Fix ChiCombo NPE and FallDamage
This commit is contained in:
OmniCypher 2016-02-21 13:16:24 -08:00
commit 3e3503be41
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java
View file

@ -55,7 +55,9 @@ public class ChiCombo extends ChiAbility implements ComboAbility {
* @param duration The time in milliseconds the target will be paralyzed
*/
private static void paralyze(Entity target, Long duration) {
PARALYZED_ENTITIES.put(target, (System.currentTimeMillis() + duration));
if (target != null) {
PARALYZED_ENTITIES.put(target, (System.currentTimeMillis() + duration));
}
}
/**
@ -86,6 +88,7 @@ public class ChiCombo extends ChiAbility implements ComboAbility {
*/
public static void handleParalysis() {
for (Entity entity : PARALYZED_ENTITIES.keySet()) {
entity.setFallDistance(0);
if (PARALYZED_ENTITIES.get(entity) <= System.currentTimeMillis()) {
PARALYZED_ENTITIES.remove(entity);