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

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

@@ -17 +17 @@
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.handler.IItemHandler;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -25 +24 @@
 import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.item.type.L2EtcItemType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -30 +31 @@
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.skills.SkillHolder;
-import com.l2jserver.gameserver.templates.item.L2EtcItemType;
+import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 
@@ -41 +42 @@
         /**
          * 
-         * @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
@@ -64 +65 @@
                 if (isPet && !item.isTradeable())
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ITEM_NOT_FOR_PETS));
+                        activeChar.sendPacket(SystemMessageId.ITEM_NOT_FOR_PETS);
                         return;
                 }
@@ -103 +104 @@
                                                 if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
                                                 {
-                                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_ITEMS));
+                                                        activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
                                                         return;
                                                 }
@@ -154 +155 @@
                                         {
                                                 playable.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+                                                
+                                                // TODO: Remove when reuse time for sub-class is implemented.
+                                                if (activeChar.isSubClassActive() && (itemSkill.getSkillType() == L2SkillType.EXTRACTABLE) && (itemSkill.getReuseDelay() > 5000) && (itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0))
+                                                {
+                                                        activeChar.sendPacket(SystemMessageId.MAIN_CLASS_SKILL_ONLY);
+                                                        return;
+                                                }
+                                                
                                                 if (!playable.useMagic(itemSkill, forceUse, false))
                                                         return;
                                                 
-                                                //consume
+                                                // Consume.
                                                 if (itemSkill.getItemConsumeId() == 0 && itemSkill.getItemConsume() > 0)
                                                 {
-                                                        if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
+                                                        if (!activeChar.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
                                                         {
-                                                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_ITEMS));
+                                                                activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
                                                                 return;
                                                         }