lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2jServer HighFive Aug 10th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-08-10 16:00:44 +00:00
parent 5d66d96eff
commit cd6d0d7188
7 changed files with 199 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
trunk/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java
View File

@ -98,6 +98,7 @@ public final class OlympiadGameTask implements Runnable
BATTLE_COUNTDOWN_SECOND,
BATTLE_STARTED,
BATTLE_IN_PROGRESS,
GAME_CANCELLED,
GAME_STOPPED,
TELEPORT_TO_TOWN,
CLEANUP,
@ -201,7 +202,7 @@ public final class OlympiadGameTask implements Runnable
{
if (!startGame())
{
_state = GameState.GAME_STOPPED;
_state = GameState.GAME_CANCELLED;
break;
}
@ -273,6 +274,13 @@ public final class OlympiadGameTask implements Runnable
break;
}
// Battle cancelled before teleport participants to the stadium
case GAME_CANCELLED:
{
stopGame();
_state = GameState.CLEANUP;
break;
}
// End of the battle
case GAME_STOPPED:
{