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

fixing teleportation issues.

Browse Source
This commit is contained in:
Sarah 2015-11-27 22:29:29 +01:00
parent fd0c5cf273
commit ad54d28b0d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,8 +72,8 @@ public abstract class GameTutorial
if(_currentPhase == null) if(_currentPhase == null)
{ {
onEnd(); onEnd();
endTutorial();
_hasEnded = true; _hasEnded = true;
endTutorial();
Manager.getPluginManager().callEvent(new GameTutorialEndEvent(this)); Manager.getPluginManager().callEvent(new GameTutorialEndEvent(this));
} }
else else
@ -97,7 +97,16 @@ public abstract class GameTutorial
player.setAllowFlight(false); player.setAllowFlight(false);
player.setFlying(false); player.setFlying(false);
if(TeleportOnEnd) if(TeleportOnEnd)
_team.SpawnTeleport(); {
Manager.runSyncLater(new Runnable()
{
@Override
public void run()
{
_team.SpawnTeleport();
}
}, 5);
}
} }
Manager.GetChat().Silence(StartAfterTutorial, false); Manager.GetChat().Silence(StartAfterTutorial, false);
Manager.GetGame().PrepareTime = (System.currentTimeMillis() - Manager.GetGame().GetStateTime()) + StartAfterTutorial; Manager.GetGame().PrepareTime = (System.currentTimeMillis() - Manager.GetGame().GetStateTime()) + StartAfterTutorial;

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

@ -64,7 +64,7 @@ public abstract class TutorialPhase
@Override @Override
public void run() public void run()
{ {
while(!_hasEnded) while(!_hasEnded && !getTutorial().hasEnded())
{ {
_tutorial.Manager.runSync(new Runnable() _tutorial.Manager.runSync(new Runnable()
{ {