From 8ec7d922904d737c1908ab27773f71d6cb841985 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 19 Dec 2017 17:55:01 +0000 Subject: [PATCH] Fix Daze Potion doing insane damage --- .../game/games/smash/perks/witch/PerkWitchPotion.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 e828c0561..4a109a73c 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 @@ -154,9 +154,8 @@ public class PerkWitchPotion extends SmashPerk implements IThrown public void Collide(LivingEntity target, Block block, ProjectileUser data) { Player thrower = (Player) data.getThrower(); - - List players = new ArrayList<>(); - players.addAll(Manager.GetGame().GetPlayers(true)); + + List players = new ArrayList<>(Manager.GetGame().GetPlayers(true)); players.removeAll(TeamSuperSmash.getTeam(Manager, thrower, true)); List directHit = UtilEnt.getPlayersInsideEntity(data.getThrown(), players); @@ -164,7 +163,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); + Manager.GetCondition().Factory().Slow(GetName(), player, thrower, 2, 1, true, true, false, false); } players.removeAll(directHit); @@ -176,7 +175,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); + Manager.GetCondition().Factory().Slow(GetName(), player, thrower, 2, 0, true, true, false, false); } }