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

trunk/L2J_DataPack/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java

@@ -17 +17 @@
 import com.l2jserver.gameserver.handler.ISkillHandler;
 import com.l2jserver.gameserver.model.L2Fishing;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+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.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.gameserver.templates.item.L2Weapon;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
@@ -40 +39 @@
          * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
          */
+        @Override
         public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
         {
@@ -53 +53 @@
                         {
                                 //Pumping skill is available only while fishing
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CAN_USE_PUMPING_ONLY_WHILE_FISHING));
+                                player.sendPacket(SystemMessageId.CAN_USE_PUMPING_ONLY_WHILE_FISHING);
                         }
                         else if (skill.getSkillType() == L2SkillType.REELING)
                         {
                                 //Reeling skill is available only while fishing
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CAN_USE_REELING_ONLY_WHILE_FISHING));
+                                player.sendPacket(SystemMessageId.CAN_USE_REELING_ONLY_WHILE_FISHING);
                         }
                         player.sendPacket(ActionFailed.STATIC_PACKET);
@@ -75 +75 @@
                 if (player.getSkillLevel(1315) <= skill.getLevel() - 2) //1315 - Fish Expertise
                 {//Penalty
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.REELING_PUMPING_3_LEVELS_HIGHER_THAN_FISHING_PENALTY));
+                        player.sendPacket(SystemMessageId.REELING_PUMPING_3_LEVELS_HIGHER_THAN_FISHING_PENALTY);
                         pen = 50;
                         int penatlydmg = dmg - pen;
@@ -101 +101 @@
          * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
          */
+        @Override
         public L2SkillType[] getSkillIds()
         {