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

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

@@ -16 +16 @@
 
 import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Broadcast;
 
@@ -35 +34 @@
         /**
          * 
-         * @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)
         {
@@ -46 +46 @@
                 if (playable instanceof L2Summon)
                 {
-                        activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PET_CANNOT_USE_ITEM));
+                        activeOwner.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
                         return;
                 }
@@ -54 +54 @@
                 if (activePet == null)
                 {
-                        activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME));
+                        activeOwner.sendPacket(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
                         return;
                 }
@@ -60 +60 @@
                 if (activePet.isDead())
                 {
-                        activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET));
+                        activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET);
                         return;
                 }
@@ -73 +73 @@
                         // Not enough SpiritShots to use.
                         if (!activeOwner.disableAutoShot(itemId))
-                                activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET));
+                                activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET);
                         return;
                 }
@@ -109 +109 @@
                 {
                         if (!activeOwner.disableAutoShot(itemId))
-                                activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET));
+                                activeOwner.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITHOTS_FOR_PET);
                         return;
                 }
                 
                 // Pet uses the power of spirit.
-                activeOwner.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PET_USE_SPIRITSHOT));
+                activeOwner.sendPacket(SystemMessageId.PET_USE_SPIRITSHOT);
                 int skillId = 0;
                 switch (itemId)