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

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

@@ -24 +24 @@
 import com.l2jserver.gameserver.handler.SkillHandler;
 import com.l2jserver.gameserver.model.L2Effect;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
@@ -33 +32 @@
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -39 +39 @@
 import com.l2jserver.gameserver.skills.Stats;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.util.Rnd;
 
@@ -75 +76 @@
          * @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)
         {
@@ -262 +264 @@
                                         }
                                         else
-                                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+                                                activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
                                         break;
                                 }
@@ -329 +331 @@
                                                 if (Formulas.calcSkillSuccess(activeChar, target, skill, shld, ss, sps, bss))
                                                 {
-                                                        if (skill.getTargetType() == L2Skill.SkillTargetType.TARGET_UNDEAD)
+                                                        if (skill.getTargetType() == L2TargetType.TARGET_UNDEAD)
                                                         {
                                                                 if (target.isUndead())
@@ -568 +570 @@
                                                                         break;
                                                                 case HEAL:
-                                                                        ISkillHandler Healhandler = SkillHandler.getInstance().getSkillHandler(L2SkillType.HEAL);
+                                                                        ISkillHandler Healhandler = SkillHandler.getInstance().getHandler(L2SkillType.HEAL);
                                                                         if (Healhandler == null)
                                                                         {
@@ -613 +615 @@
          * @param target
          * @param type
-         * @param power
+         * @param negateLvl 
          * @param maxRemoved
          * @return
@@ -626 +628 @@
          * @param target
          * @param type
-         * @param power
+         * @param negateLvl 
          * @param skillId
          * @param maxRemoved
@@ -723 +725 @@
          * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
          */
+        @Override
         public L2SkillType[] getSkillIds()
         {