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

Jumping disabled during Pyromancer ULT

This commit is contained in:
Sam 2016-07-28 21:01:29 +01:00
parent 446aec5187
commit 771f643b42
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/QuiverPayload.java
View File

@ -72,6 +72,7 @@ public class QuiverPayload extends TeamGame
private static final int ULTIMATE_PERCENTAGE_INCREASE_KILL = 5; private static final int ULTIMATE_PERCENTAGE_INCREASE_KILL = 5;
private static final int ULTIMATE_PERCENTAGE_INCREASE_ASSIST = 2; private static final int ULTIMATE_PERCENTAGE_INCREASE_ASSIST = 2;
private static final long POWERUP_SPAWN_DELAY = 20000; private static final long POWERUP_SPAWN_DELAY = 20000;
private static final int RESPAWN_ARROW_GIVE_DELAY = 30;
private Minecart _minecart; private Minecart _minecart;
private Hologram _hologram; private Hologram _hologram;
@ -220,7 +221,7 @@ public class QuiverPayload extends TeamGame
GameTeam teamA = GetTeamList().get(0); GameTeam teamA = GetTeamList().get(0);
GameTeam teamB = GetTeamList().get(1); GameTeam teamB = GetTeamList().get(1);
if (getTrackDistanceToMarker(getDestination(teamA)) < getTrackDistanceToMarker(getDestination(teamB))) if (getTrackDistanceToMarker(getDestination(teamA)) > getTrackDistanceToMarker(getDestination(teamB)))
{ {
WinnerTeam = teamA; WinnerTeam = teamA;
} }
@ -576,7 +577,7 @@ public class QuiverPayload extends TeamGame
player.getInventory().addItem(Quiver.SUPER_ARROW); player.getInventory().addItem(Quiver.SUPER_ARROW);
} }
} }
}.runTaskLater(Manager.getPlugin(), 10); }.runTaskLater(Manager.getPlugin(), RESPAWN_ARROW_GIVE_DELAY);
} }
@EventHandler @EventHandler

10
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/ultimates/UltimatePyromancer.java
View File

@ -13,10 +13,13 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile; import org.bukkit.entity.Projectile;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import mineplex.core.common.Rank;
import mineplex.core.common.util.UtilParticle; 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;
@ -98,7 +101,8 @@ public class UltimatePyromancer extends Ultimate
Set<Entity> entities = new HashSet<>(); Set<Entity> entities = new HashSet<>();
player.setWalkSpeed(0.1F); player.setWalkSpeed(0.05F);
player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP, (int) ((getLength() / 1000) * 20), -10));
_tasks.put(player.getUniqueId(), (new BukkitRunnable() _tasks.put(player.getUniqueId(), (new BukkitRunnable()
{ {
@ -111,7 +115,7 @@ public class UltimatePyromancer extends Ultimate
Arrow arrow = player.launchProjectile(Arrow.class); Arrow arrow = player.launchProjectile(Arrow.class);
arrow.setCritical(true); arrow.setCritical(true);
arrow.setVelocity(new Vector((Math.random() - 0.5) * 3, 0, (Math.random() - 0.5) * 3)); arrow.setVelocity(new Vector((Math.random() - 0.5) * 4, 0, (Math.random() - 0.5) * 4));
entities.add(arrow); entities.add(arrow);
} }
@ -132,7 +136,7 @@ public class UltimatePyromancer extends Ultimate
{ {
entity.remove(); entity.remove();
} }
_entities.remove(player.getUniqueId()); _entities.remove(player.getUniqueId());
} }