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

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

@@ -28 +28 @@
 import com.l2jserver.gameserver.datatables.SummonItemsData;
 import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Spawn;
@@ -39 +38 @@
 import com.l2jserver.gameserver.model.actor.instance.L2XmassTreeInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
@@ -52 +52 @@
         /**
          * 
-         * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
+         * @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.item.instance.L2ItemInstance, boolean)
          */
+        @Override
         public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
         {
@@ -69 +70 @@
                 if (activeChar.isSitting())
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANT_MOVE_SITTING));
+                        activeChar.sendPacket(SystemMessageId.CANT_MOVE_SITTING);
                         return;
                 }
@@ -81 +82 @@
                 if (activeChar.isInOlympiadMode())
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT));
+                        activeChar.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
                         return;
                 }
@@ -91 +92 @@
                 if ((activeChar.getPet() != null || activeChar.isMounted()) && sitem.isPetSummon())
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_ALREADY_HAVE_A_PET));
+                        activeChar.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_PET);
                         return;
                 }
@@ -97 +98 @@
                 if (activeChar.isAttackingNow())
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_IN_COMBAT));
-                        return;
-                }
-                
-                if (activeChar.isCursedWeaponEquipped() && sitem.isPetSummon())
-                {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_IN_BATTLE));
+                        activeChar.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_IN_COMBAT);
                         return;
                 }
@@ -151 +146 @@
                                 catch (Exception e)
                                 {
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_CANT_FOUND));
+                                        activeChar.sendPacket(SystemMessageId.TARGET_CANT_FOUND);
                                 }
                                 break;
@@ -160 +155 @@
                                 activeChar.setTarget(oldTarget);
                                 activeChar.sendPacket(new SetupGauge(0, 5000));
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SUMMON_A_PET));
+                                activeChar.sendPacket(SystemMessageId.SUMMON_A_PET);
                                 activeChar.setIsCastingNow(true);
                                 
@@ -185 +180 @@
                 }
                 
+                @Override
                 public void run()
                 {
@@ -215 +211 @@
                 }
                 
+                @Override
                 public void run()
                 {
@@ -263 +260 @@
                                 petSummon.setFollowStatus(true);
                                 
-                                petSummon.getOwner().sendPacket(new PetItemList(petSummon));
+                                petSummon.sendPacket(new PetItemList(petSummon));
                                 petSummon.broadcastStatusUpdate();
                         }