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

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

@@ -1,6 +1,5 @@
 package nautilus.game.arcade.gametutorial;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 
 import mineplex.core.common.util.UtilServer;
@@ -151,6 +150,11 @@ public abstract class GameTutorial
 		return _players;
 	}
 	
+	public GameTeam getTeam()
+	{
+		return _team;
+	}
+	
 	public void onTick(int tick){}
 	
 	public void onStart(){}

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

@@ -25,16 +25,6 @@ public abstract class TutorialPhase
 		_text = text;
 	}
 	
-	public TutorialText[] getText()
-	{
-		return _text;
-	}
-	
-	public Location getLocation()
-	{
-		return _location;
-	}
-	
 	final public void start()
 	{
 		_hasEnded = false;
@@ -169,6 +159,16 @@ public abstract class TutorialPhase
 		return null;
 	}
 	
+	public TutorialText[] getText()
+	{
+		return _text;
+	}
+	
+	public Location getLocation()
+	{
+		return _location;
+	}
+	
 	public void setTutorial(GameTutorial tutorial)
 	{
 		_tutorial = tutorial;
@@ -184,6 +184,16 @@ public abstract class TutorialPhase
 		_target = target;
 	}
 	
+	public GameTutorial getTutorial()
+	{
+		return _tutorial;
+	}
+	
+	public Location getTarget()
+	{
+		return _target;
+	}
+	
 	public void onStart(){}
 	
 	public void onMessageDisplay(TutorialText text){}