JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Witch changes

Browse Source
This commit is contained in:
Sam 2017-05-01 13:13:40 +01:00
parent 69ed0c7c24
commit 3c852f091d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkBatWave.java
View File

@ -293,7 +293,7 @@ public class PerkBatWave extends SmashPerk
bat.remove();
}
_bats.remove(player);
_bats.remove(player.getUniqueId());
}
}
@ -311,7 +311,7 @@ public class PerkBatWave extends SmashPerk
{
_damageTaken.put(key, (_damageTaken.get(key) + event.GetDamage()));
if (_damageTaken.get(key) >= _disableDamage)
if (event.GetCause() == DamageCause.ENTITY_ATTACK || _damageTaken.get(key) >= _disableDamage)
{
Clear(player);
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkWitchPotion.java
View File

@ -164,6 +164,7 @@ public class PerkWitchPotion extends SmashPerk implements IThrown
for (Player player : directHit)
{
Manager.GetDamage().NewDamageEvent(player, thrower, null, DamageCause.CUSTOM, _damageDirect, true, true, false, thrower.getName(), GetName());
Manager.GetCondition().Factory().Slow(GetName(), target, thrower, 2, 1, true, true, false, false);
}
players.removeAll(directHit);
@ -175,6 +176,7 @@ public class PerkWitchPotion extends SmashPerk implements IThrown
if(!UtilEnt.isInsideBoundingBox(player, a, b)) continue;
Manager.GetDamage().NewDamageEvent(player, thrower, null, DamageCause.CUSTOM, _damageDistance, true, true, false, thrower.getName(), GetName());
Manager.GetCondition().Factory().Slow(GetName(), target, thrower, 2, 0, true, true, false, false);
}
}