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

trunk/L2J_DataPack/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java

@@ -19 +19 @@
 import javolution.util.FastList;
 
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
  */
-public class TargetCorpsePlayer implements ISkillTargetTypeHandler
+public class TargetCorpsePlayer implements ITargetTypeHandler
 {
         @Override
@@ -71 +70 @@
                                                 {
                                                         condGood = false;
-                                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE));
+                                                        activeChar.sendPacket(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE);
                                                 }
                                                 
@@ -82 +81 @@
                                                 {
                                                         if (targetPlayer.isRevivingPet())
-                                                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MASTER_CANNOT_RES)); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
+                                                                player.sendPacket(SystemMessageId.MASTER_CANNOT_RES); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
                                                         else
-                                                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED)); // Resurrection is already been proposed.
+                                                                player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
                                                         condGood = false;
                                                 }
@@ -95 +94 @@
                                                         {
                                                                 if (targetPet.getOwner().isRevivingPet())
-                                                                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED)); // Resurrection is already been proposed.
+                                                                        player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
                                                                 else
-                                                                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_RES_PET2)); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
+                                                                        player.sendPacket(SystemMessageId.CANNOT_RES_PET2); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
                                                                 condGood = false;
                                                         }
@@ -111 +110 @@
                                                 return targetList.toArray(new L2Object[targetList.size()]);
                                         }
-                                        else
-                                                return new L2Character[] { target };
+                                        return new L2Character[] { target };
                                 }
                         }
                 }
-                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+                activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
                 return _emptyTargetList;
         }
         
         @Override
-        public Enum<SkillTargetType> getTargetType()
+        public Enum<L2TargetType> getTargetType()
         {
-                return SkillTargetType.TARGET_CORPSE_PLAYER;
+                return L2TargetType.TARGET_CORPSE_PLAYER;
         }
 }