Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars

This commit is contained in:
Sarah 2015-11-21 18:19:12 +01:00
commit 15032ac7ff
1 changed files with 4 additions and 1 deletions

View File

@ -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;