Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java (modified) (2 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java

@@ -28 +28 @@
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.util.StringUtil;
 
@@ -205 +204 @@
                                 return true;
                         }
-                        else
-                        // change
-                        {
-                                if (isManager)
-                                {
-                                        if (OlympiadManager.getInstance().isRegisteredInComp(activeChar))
-                                        {
-                                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME));
-                                                return false;
-                                        }
-                                        if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(activeChar.getObjectId()))
-                                        {
-                                                activeChar.sendMessage("You can not observe games while registered for TvT");
-                                                return false;
-                                        }
-                                }
-                                
-                                final int arenaId = Integer.parseInt(command.substring(12).trim());
-                                final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(arenaId);
-                                if (nextArena != null)
-                                {
-                                        activeChar.enterOlympiadObserverMode(nextArena.getZone().getSpawns().get(0), arenaId);
-                                        activeChar.setInstanceId(OlympiadGameManager.getInstance().getOlympiadTask(arenaId).getZone().getInstanceId());
-                                        return true;
-                                }
+                        
+                        if (isManager)
+                        {
+                                if (OlympiadManager.getInstance().isRegisteredInComp(activeChar))
+                                {
+                                        activeChar.sendPacket(SystemMessageId.WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME);
+                                        return false;
+                                }
+                                if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(activeChar.getObjectId()))
+                                {
+                                        activeChar.sendMessage("You can not observe games while registered for TvT");
+                                        return false;
+                                }
+                        }
+                        
+                        final int arenaId = Integer.parseInt(command.substring(12).trim());
+                        final OlympiadGameTask nextArena = OlympiadGameManager.getInstance().getOlympiadTask(arenaId);
+                        if (nextArena != null)
+                        {
+                                activeChar.enterOlympiadObserverMode(nextArena.getZone().getSpawns().get(0), arenaId);
+                                activeChar.setInstanceId(OlympiadGameManager.getInstance().getOlympiadTask(arenaId).getZone().getInstanceId());
+                                return true;
                         }
                 }