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

carl spinner in arcade/ 

tutorial fixes
This commit is contained in:
Mini-Chiss 2015-08-12 08:36:21 +02:00
parent e8963cc2af
commit 7cda53cb28
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Hub/src/mineplex/hub/tutorial/types/PartyTutorial.java
View File

@ -118,8 +118,8 @@ public class PartyTutorial extends Tutorial
)); ));
_phases.add(new TutorialPhase( _phases.add(new TutorialPhase(
manager.GetSpawn().add(0, -2, 0), manager.GetSpawn().add(0, 0, 0),
manager.GetSpawn().add(0, -2.1, 5), manager.GetSpawn().add(0, 0.1, 5),
"End", "End",
new String[] new String[]
{ {

4
Plugins/Mineplex.Hub/src/mineplex/hub/tutorial/types/WelcomeTutorial.java
View File

@ -132,8 +132,8 @@ public class WelcomeTutorial extends Tutorial
//END //END
_phases.add(new TutorialPhase( _phases.add(new TutorialPhase(
manager.GetSpawn().add(0, -2, 0), manager.GetSpawn().add(0, 0, 0),
manager.GetSpawn().add(0, -2.1, 5), manager.GetSpawn().add(0, 0.1, 5),
"End", "End",
new String[] new String[]
{ {

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

@ -3,6 +3,7 @@ package nautilus.game.arcade.managers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import mineplex.core.bonuses.event.CarlSpinnerEvent;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilFirework; import mineplex.core.common.util.UtilFirework;
@ -692,4 +693,14 @@ public class GameManager implements Listener
{ {
event.GetGame().EndCheck(); event.GetGame().EndCheck();
} }
@EventHandler
public void carlSpinnerCancel(CarlSpinnerEvent event)
{
Game game = Manager.GetGame();
if (game == null) return;
if (game.GetCountdown() > 0)
event.setCancelled(true);
}
} }