Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/itemhandlers/MercTicket.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/itemhandlers/MercTicket.java (modified) (6 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java

@@ -19 +19 @@
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.MercTicketManager;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 public class MercTicket implements IItemHandler
@@ -40 +39 @@
          * 3) Remove the item from the person's inventory
          */
+        @Override
         public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
         {
@@ -52 +52 @@
                 if (MercTicketManager.getInstance().getTicketCastleId(itemId) != castleId)
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MERCENARIES_CANNOT_BE_POSITIONED_HERE));
+                        activeChar.sendPacket(SystemMessageId.MERCENARIES_CANNOT_BE_POSITIONED_HERE);
                         return;
                 }
-                
-                if (!activeChar.isCastleLord(castleId))
+                else if (!activeChar.isCastleLord(castleId))
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_AUTHORITY_TO_POSITION_MERCENARIES));
+                        activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_AUTHORITY_TO_POSITION_MERCENARIES);
                         return;
                 }
-                
-                if (castle.getSiege().getIsInProgress())
+                else if (castle.getSiege().getIsInProgress())
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE));
+                        activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
                         return;
                 }
@@ -72 +70 @@
                 {
                         //_log.warning("Someone has tried to spawn a guardian during Quest Event Period of The Seven Signs.");
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE));
+                        activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
                         return;
                 }
@@ -79 +77 @@
                 {
                         case SevenSigns.CABAL_NULL:
+                        {
                                 if (SevenSigns.getInstance().checkIsDawnPostingTicket(itemId))
                                 {
                                         //_log.warning("Someone has tried to spawn a Dawn Mercenary though the Seal of Strife is not controlled by anyone.");
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE));
+                                        activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
                                         return;
                                 }
                                 break;
+                        }
                         case SevenSigns.CABAL_DUSK:
+                        {
                                 if (!SevenSigns.getInstance().checkIsRookiePostingTicket(itemId))
                                 {
                                         //_log.warning("Someone has tried to spawn a non-Rookie Mercenary though the Seal of Strife is controlled by Revolutionaries of Dusk.");
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE));
+                                        activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
                                         return;
                                 }
                                 break;
+                        }
                         case SevenSigns.CABAL_DAWN:
+                        {
                                 break;
+                        }
                 }
                 
                 if(MercTicketManager.getInstance().isAtCasleLimit(item.getItemId()))
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE));
+                        activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
                         return;
                 }
-                
-                if (MercTicketManager.getInstance().isAtTypeLimit(item.getItemId()))
+                else if (MercTicketManager.getInstance().isAtTypeLimit(item.getItemId()))
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE));
+                        activeChar.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
                         return;
                 }
-                if (MercTicketManager.getInstance().isTooCloseToAnotherTicket(activeChar.getX(), activeChar.getY(), activeChar.getZ()))
+                else if (MercTicketManager.getInstance().isTooCloseToAnotherTicket(activeChar.getX(), activeChar.getY(), activeChar.getZ()))
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.POSITIONING_CANNOT_BE_DONE_BECAUSE_DISTANCE_BETWEEN_MERCENARIES_TOO_SHORT));
+                        activeChar.sendPacket(SystemMessageId.POSITIONING_CANNOT_BE_DONE_BECAUSE_DISTANCE_BETWEEN_MERCENARIES_TOO_SHORT);
                         return;
                 }
@@ -117 +120 @@
                 MercTicketManager.getInstance().addTicket(item.getItemId(), activeChar, null);
                 activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false); // Remove item from char's inventory
-                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PLACE_CURRENT_LOCATION_DIRECTION).addItemName(item));
+                activeChar.sendPacket(SystemMessageId.PLACE_CURRENT_LOCATION_DIRECTION);
         }
 }