Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
This commit is contained in:
commit
15032ac7ff
|
@ -143,6 +143,7 @@ public class GameManager implements Listener
|
|||
{
|
||||
game.addTutorials();
|
||||
}
|
||||
boolean finished = true;
|
||||
if(game.EnableTutorials)
|
||||
{
|
||||
for(final GameTeam team : game.GetTeamList())
|
||||
|
@ -164,10 +165,12 @@ public class GameManager implements Listener
|
|||
}
|
||||
if(!team.getTutorial().hasEnded())
|
||||
{
|
||||
return;
|
||||
finished = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!finished)
|
||||
return;
|
||||
}
|
||||
|
||||
double percentage = (double) (System.currentTimeMillis() - game.GetStateTime()) / game.PrepareTime;
|
||||
|
|
Loading…
Reference in New Issue