From 3c852f091d516713f987355ddf39669033e56411 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 1 May 2017 13:13:40 +0100 Subject: [PATCH] Witch changes --- .../game/arcade/game/games/smash/perks/witch/PerkBatWave.java | 4 ++-- .../arcade/game/games/smash/perks/witch/PerkWitchPotion.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkBatWave.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkBatWave.java index b2a2c57e5..298f58edf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkBatWave.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkBatWave.java @@ -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); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkWitchPotion.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkWitchPotion.java index 2c18b75ec..217f01b77 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkWitchPotion.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witch/PerkWitchPotion.java @@ -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); } }