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

Destructor changes

This commit is contained in:
Sam 2017-03-25 16:05:16 +00:00
parent 5564dc7daf
commit 02a6f34bd3
2 changed files with 8 additions and 3 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/bridge/Bridge.java
View File

@ -1712,7 +1712,7 @@ public class Bridge extends TeamGame implements OreObsfucation
@EventHandler @EventHandler
public void updateBorder(UpdateEvent event) public void updateBorder(UpdateEvent event)
{ {
if (event.getType() != UpdateType.FAST || _bridgesDown) if (!IsLive() || event.getType() != UpdateType.FAST || _bridgesDown)
{ {
return; return;
} }
@ -1735,11 +1735,16 @@ public class Bridge extends TeamGame implements OreObsfucation
for (Player player : team.GetPlayers(true)) for (Player player : team.GetPlayers(true))
{ {
if (player.getGameMode() != GameMode.SURVIVAL)
{
continue;
}
Location location = player.getLocation(); Location location = player.getLocation();
if (!UtilAlg.inBoundingBox(location, one, two)) if (!UtilAlg.inBoundingBox(location, one, two))
{ {
player.setVelocity(UtilAlg.getTrajectory(location, average).add(new Vector(0, 1, 0))); player.setVelocity(UtilAlg.getTrajectory(location, average).multiply(3).add(new Vector(0, 0.5, 0)));
player.sendMessage(C.cRedB + "STAY ON YOUR ISLAND!"); player.sendMessage(C.cRedB + "STAY ON YOUR ISLAND!");
player.playSound(player.getLocation(), Sound.NOTE_PLING, 1, 0.5F); player.playSound(player.getLocation(), Sound.NOTE_PLING, 1, 0.5F);
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java
View File

@ -26,7 +26,7 @@ public class KitDestructor extends ProgressingKit
}; };
private static final Perk[] PERKS = { private static final Perk[] PERKS = {
new PerkDestructor(40, 2, 400, false) new PerkDestructor(40, 2, 400, 1.5, false)
}; };
private static final Achievement[] ACHIEVEMENTS = { private static final Achievement[] ACHIEVEMENTS = {