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

trunk/L2J_DataPack/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.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.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.item.L2Weapon;
+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.templates.item.L2Item;
-import com.l2jserver.gameserver.templates.item.L2Weapon;
 import com.l2jserver.gameserver.util.Broadcast;
 
@@ -36 +35 @@
         /**
          * 
-         * @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 synchronized void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
         {
@@ -52 +52 @@
                 {
                         if (!activeChar.getAutoSoulShot().contains(itemId))
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_SPIRITSHOTS));
+                                activeChar.sendPacket(SystemMessageId.CANNOT_USE_SPIRITSHOTS);
                         return;
                 }
@@ -98 +98 @@
                 {
                         if (!activeChar.getAutoSoulShot().contains(itemId))
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH));
+                                activeChar.sendPacket(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH);
                         
                         return;
@@ -108 +108 @@
                 {
                         if (!activeChar.disableAutoShot(itemId))
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS));
+                                activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_SPIRITSHOTS);
                         return;
                 }
@@ -116 +116 @@
                 
                 // Send message to client
-                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ENABLED_SPIRITSHOT));
+                activeChar.sendPacket(SystemMessageId.ENABLED_SPIRITSHOT);
                 int skillId = 0;
                 switch (itemId)