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

Fix Daze Potion doing insane damage

This commit is contained in:
Sam 2017-12-19 17:55:01 +00:00 committed by Alexander Meech
parent e09f7fcb5d
commit 8ec7d92290
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<Player> players = new ArrayList<>();
players.addAll(Manager.GetGame().GetPlayers(true));
List<Player> players = new ArrayList<>(Manager.GetGame().GetPlayers(true));
players.removeAll(TeamSuperSmash.getTeam(Manager, thrower, true));
List<Player> 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);
}
}