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

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

# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
This commit is contained in:
Sarah 2015-11-24 16:25:44 +01:00
parent 2a64d06bdd 95b4ad74e8
commit fac7d152ae
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/GameTutorial.java
View File

@ -64,7 +64,7 @@ public abstract class GameTutorial
}
else
{
Manager.GetChat().Silence((System.currentTimeMillis() - Manager.GetGame().GetStateTime()) + 7000, false);
Manager.GetChat().Silence(7000, false);
onPhaseChange(_currentPhase);
_currentPhase.start();
}
@ -85,7 +85,7 @@ public abstract class GameTutorial
if(TeleportOnEnd)
_team.SpawnTeleport();
}
Manager.GetChat().Silence((System.currentTimeMillis() - Manager.GetGame().GetStateTime()) + 5000, false);
Manager.GetChat().Silence(5000, false);
Manager.GetGame().PrepareTime = (System.currentTimeMillis() - Manager.GetGame().GetStateTime()) + 5000;
}

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java
View File

@ -113,9 +113,8 @@ public abstract class TutorialPhase
players[i] = player;
i++;
}
UtilTextMiddle.display("", text.getText(), 0, text.getStayTime(), 0, players);
onMessageDisplay(text);
try
displayMessage(text);
UtilTextMiddle.display("", text.getText(), 0, text.getStayTime(), 0, players); try
{
Thread.sleep(text.getStayTime() * 50);
} catch (InterruptedException e)

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialText.java
View File

@ -35,4 +35,9 @@ public class TutorialText
return _stayTime;
}
public void setText(String text)
{
_text = text;
}
}