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

Fixed zombie perk Deaths Grasp

Browse Source
This commit is contained in:
xGamingDudex 2016-10-21 16:51:47 +02:00
parent b8c474a92d
commit cfd2343f0e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java
View File

@ -29,13 +29,13 @@ import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist; import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.game.games.smash.TeamSuperSmash;
import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.Perk;
public class PerkDeathsGrasp extends Perk public class PerkDeathsGrasp extends Perk
@ -97,6 +97,7 @@ public class PerkDeathsGrasp extends Perk
{ {
return; return;
} }
//Leap End & Collide //Leap End & Collide
for(Iterator<Entry<UUID, Long>> it = _live.entrySet().iterator(); it.hasNext();) for(Iterator<Entry<UUID, Long>> it = _live.entrySet().iterator(); it.hasNext();)
@ -106,14 +107,16 @@ public class PerkDeathsGrasp extends Perk
if(player == null) if(player == null)
{ {
it.remove(); it.remove();
return;
} }
if (UtilEnt.isGrounded(player) || UtilTime.elapsed(e.getValue(), LEAP_DURATION)) if (UtilEnt.isGrounded(player) && UtilTime.elapsed(e.getValue(), LEAP_DURATION))
{ {
it.remove(); it.remove();
return;
} }
List<Player> team = Manager.GetGame().GetTeam(player).GetPlayers(true); List<Player> team = TeamSuperSmash.getTeam(Manager, player, true);
for (Player other : Manager.GetGame().GetPlayers(true)) for (Player other : Manager.GetGame().GetPlayers(true))
{ {
if(team.contains(other)) if(team.contains(other))