Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial

This commit is contained in:
William Burns 2015-12-10 20:53:01 +00:00
commit 0bd276c16a

View File

@ -172,13 +172,13 @@ public class GameManager implements Listener
if(!team.getTutorial().hasEnded())
{
finished = false;
}
if(checkForTimer)
{
if(team.getTutorial().ShowPrepareTimer)
finished = false;
else
finished = true;
if(checkForTimer)
{
if(team.getTutorial().ShowPrepareTimer)
finished = false;
else
finished = true;
}
}
}
if(prepTime <= timeUsage)