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/managers/GameManager.java
This commit is contained in:
Sarah 2015-11-24 15:43:59 +01:00
parent 46362a3d5f 66598ce97e
commit 49f6679537
3 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,8 @@ public abstract class GameTutorial
private int _tick;
public boolean TeleportOnEnd = true;
public GameTutorial(ArcadeManager manager, TutorialPhase[] phases)
{
Manager = manager;
@ -75,20 +77,14 @@ public abstract class GameTutorial
private void endTutorial()
{
Manager.runSync(new Runnable()
for(Player player : _players.keySet())
{
@Override
public void run()
{
for(Player player : _players.keySet())
{
VisibilityManager.Instance.setVisibility(player, true, UtilServer.getPlayers());
player.setAllowFlight(false);
player.setFlying(false);
player.teleport(_players.get(player));
}
}
});
VisibilityManager.Instance.setVisibility(player, true, UtilServer.getPlayers());
player.setAllowFlight(false);
player.setFlying(false);
if(TeleportOnEnd)
_team.SpawnTeleport();
}
Manager.GetChat().Silence((System.currentTimeMillis() - Manager.GetGame().GetStateTime()) + 5000, false);
Manager.GetGame().PrepareTime = (System.currentTimeMillis() - Manager.GetGame().GetStateTime()) + 5000;
}

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

@ -98,8 +98,8 @@ public abstract class TutorialPhase
public void run()
{
_hasEnded = true;
_tutorial.nextPhase();
onEnd();
onEnd();
_tutorial.nextPhase();
}
});
break;

46
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
View File

@ -122,14 +122,10 @@ public class GameManager implements Listener
}
}
@EventHandler
public void DisplayPrepareTime(UpdateEvent event)
public boolean isInTutorial()
{
if (event.getType() != UpdateType.TICK)
return;
if (Manager.GetGame() == null || Manager.GetGame().GetState() != GameState.Prepare)
return;
return false;
Game game = Manager.GetGame();
@ -162,9 +158,25 @@ public class GameManager implements Listener
}
}
if(!finished)
return;
}
return true;
}
return false;
}
@EventHandler
public void DisplayPrepareTime(UpdateEvent event)
{
if (event.getType() != UpdateType.TICK)
return;
if (Manager.GetGame() == null || Manager.GetGame().GetState() != GameState.Prepare)
return;
Game game = Manager.GetGame();
if(isInTutorial())
return;
double percentage = (double) (System.currentTimeMillis() - game.GetStateTime()) / game.PrepareTime;
for (Player player : UtilServer.getPlayers())
@ -186,7 +198,7 @@ public class GameManager implements Listener
if(game.GetState() != GameState.Prepare)
return;
if(game.EnableTutorials)
{
for(GameTeam team : game.GetTeamList())
@ -248,19 +260,9 @@ public class GameManager implements Listener
}
else if (game.GetState() == GameState.Prepare)
{
if(game.EnableTutorials)
{
for(GameTeam team : game.GetTeamList())
{
if(team.getTutorial() != null)
{
if(!team.getTutorial().hasEnded())
{
return;
}
}
}
}
if(isInTutorial())
return;
if (game.CanStartPrepareCountdown())
{
if (UtilTime.elapsed(game.GetStateTime(), game.PrepareTime))