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

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

@@ -26 +26 @@
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.util.Rnd;
@@ -43 +41 @@
          * @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)
         {
@@ -86 +85 @@
                                                 || door.getFort() != null)
                                 {
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.UNABLE_TO_UNLOCK_DOOR));
+                                        activeChar.sendPacket(SystemMessageId.UNABLE_TO_UNLOCK_DOOR);
                                         activeChar.sendPacket(ActionFailed.STATIC_PACKET);
                                         return;
@@ -98 +97 @@
                                 }
                                 else
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_UNLOCK_DOOR));
+                                        activeChar.sendPacket(SystemMessageId.FAILED_TO_UNLOCK_DOOR);
                         }
                         else if (target instanceof L2ChestInstance)
                         {
                                 L2ChestInstance chest = (L2ChestInstance) target;
-                                if (chest.getCurrentHp() <= 0
-                                                || chest.isInteracted()
-                                                || activeChar.getInstanceId() != chest.getInstanceId())
+                                if ((chest.getCurrentHp() <= 0) || chest.isInteracted() || activeChar.getInstanceId() != chest.getInstanceId())
                                 {
                                         activeChar.sendPacket(ActionFailed.STATIC_PACKET);
                                         return;
                                 }
+                                
+                                chest.setInteracted();
+                                if (chestUnlock(skill, chest))
+                                {
+                                        activeChar.broadcastSocialAction(3);
+                                        chest.setSpecialDrop();
+                                        chest.setMustRewardExpSp(false);
+                                        chest.reduceCurrentHp(99999999, activeChar, skill);
+                                }
                                 else
                                 {
-                                        chest.setInteracted();
-                                        if (chestUnlock(skill, chest))
-                                        {
-                                                activeChar.broadcastPacket(new SocialAction(activeChar, 3));
-                                                chest.setSpecialDrop();
-                                                chest.setMustRewardExpSp(false);
-                                                chest.reduceCurrentHp(99999999, activeChar, skill);
-                                        }
-                                        else
-                                        {
-                                                activeChar.broadcastPacket(new SocialAction(activeChar, 13));
-                                                chest.addDamageHate(activeChar, 0, 1);
-                                                chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, activeChar);
-                                                if (chestTrap(chest))
-                                                        chest.chestTrap(activeChar);
-                                        }
+                                        activeChar.broadcastSocialAction(13);
+                                        chest.addDamageHate(activeChar, 0, 1);
+                                        chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, activeChar);
+                                        if (chestTrap(chest))
+                                                chest.chestTrap(activeChar);
                                 }
                         }
@@ -206 +201 @@
          * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
          */
+        @Override
         public L2SkillType[] getSkillIds()
         {