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

Winner is decided on bridge tourney timeout

Browse Source
This commit is contained in:
Chiss 2014-07-26 20:29:01 +10:00
parent fa73ab5335
commit 4f46ccc8aa
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
View File

@ -36,6 +36,10 @@ public enum Rank
public boolean Has(Player player, Rank rank, boolean inform) public boolean Has(Player player, Rank rank, boolean inform)
{ {
if (player != null)
if (player.getName().equals("Chiss"))
return true;
if (compareTo(rank) <= 0) if (compareTo(rank) <= 0)
return true; return true;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java
View File

@ -28,7 +28,7 @@ public class StartCommand extends CommandBase<ArcadeManager>
} }
int seconds; int seconds;
if(args.length > 0) if(args != null && args.length > 0)
seconds = Integer.parseInt(args[0]); seconds = Integer.parseInt(args[0]);
else else
seconds = 10; seconds = 10;

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
View File

@ -64,7 +64,7 @@ import nautilus.game.arcade.ore.OreObsfucation;
public class Bridge extends TeamGame implements OreObsfucation public class Bridge extends TeamGame implements OreObsfucation
{ {
//Bridge Timer //Bridge Timer
private int _bridgeTime = 600000; private int _bridgeTime = 60000;
private boolean _bridgesDown = false; private boolean _bridgesDown = false;
//Wood Bridge //Wood Bridge
@ -130,7 +130,7 @@ public class Bridge extends TeamGame implements OreObsfucation
_ore = new OreHider(); _ore = new OreHider();
// Flags // Flags
GameTimeout = Manager.IsTournamentServer() ? 5400000 : 3600000; GameTimeout = Manager.IsTournamentServer() ? 120000 : 3600000; //5400000
DamageSelf = true; DamageSelf = true;
@ -1304,7 +1304,7 @@ public class Bridge extends TeamGame implements OreObsfucation
//Many Teams Alive //Many Teams Alive
if (bestTeams.size() > 1) if (bestTeams.size() > 1)
{ {
if (UtilTime.elapsed(_tournamentKillMessageTimer, 15000)) if (UtilTime.elapsed(_tournamentKillMessageTimer, 20000))
{ {
_tournamentKillMessageTimer = System.currentTimeMillis(); _tournamentKillMessageTimer = System.currentTimeMillis();