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

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

@@ -15 +15 @@
 package handlers.targethandlers;
 
-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.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
  */
-public class TargetPartyOther implements ISkillTargetTypeHandler
+public class TargetPartyOther implements ITargetTypeHandler
 {
         @Override
@@ -45 +44 @@
                                                 case 426:
                                                         if (!((L2PcInstance) target).isMageClass())
+                                                        {
                                                                 return new L2Character[] { target };
-                                                        else
-                                                                return _emptyTargetList;
+                                                        }
+                                                        return _emptyTargetList;
                                                 case 427:
                                                         if (((L2PcInstance) target).isMageClass())
+                                                        {
                                                                 return new L2Character[] { target };
-                                                        else
-                                                                return _emptyTargetList;
+                                                        }
+                                                        return _emptyTargetList;
                                         }
                                 }
                                 return new L2Character[] { target };
                         }
-                        else
-                                return _emptyTargetList;
-                }
-                else
-                {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
                         return _emptyTargetList;
                 }
+                activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+                return _emptyTargetList;
         }
         
         @Override
-        public Enum<SkillTargetType> getTargetType()
+        public Enum<L2TargetType> getTargetType()
         {
-                return SkillTargetType.TARGET_PARTY_OTHER;
+                return L2TargetType.TARGET_PARTY_OTHER;
         }
 }