Advertisement
Nik

Untitled

Nik
Jul 18th, 2012
116
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.85 KB | None | 0 0
  1. Index: /trunk/High_Five_DP/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java
  2. ===================================================================
  3. --- /trunk/High_Five_DP/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java (revision 766)
  4. +++ /trunk/High_Five_DP/dist/game/data/scripts/handlers/skillhandlers/TakeFort.java (revision 868)
  5. @@ -27,41 +27,41 @@
  6.   * @author _drunk_
  7.   */
  8.  public class TakeFort implements ISkillHandler
  9.  {
  10.     private static final L2SkillType[] SKILL_IDS =
  11.     {
  12.         L2SkillType.TAKEFORT
  13.     };
  14.    
  15.     @Override
  16.     public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
  17.     {
  18.         if (!activeChar.isPlayer() || targets.length == 0)
  19.             return;
  20.        
  21.         L2PcInstance player = activeChar.getActingPlayer();
  22.         if (player.getClan() == null)
  23.             return;
  24.        
  25.         Fort fort = FortManager.getInstance().getFort(player);
  26. -       if (fort == null || !player.checkIfOkToCastFlagDisplay(fort, true, skill, activeChar.getTarget())) // The first target should be that flagpole
  27. +       if (fort == null || !player.checkIfOkToCastFlagDisplay(fort, true, skill, targets[0])) // The first target should be that flagpole
  28.             return;
  29.        
  30.         try
  31.         {
  32.             fort.endOfSiege(player.getClan());
  33.         }
  34.         catch (Exception e)
  35.         {
  36.             e.printStackTrace();
  37.         }
  38.     }
  39.    
  40.     @Override
  41.     public L2SkillType[] getSkillIds()
  42.     {
  43.         return SKILL_IDS;
  44.     }
  45.    
  46.     public static void main(String[] args)
  47.     {
  48. Index: /trunk/High_Five_DP/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java
  49. ===================================================================
  50. --- /trunk/High_Five_DP/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java  (revision 347)
  51. +++ /trunk/High_Five_DP/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java  (revision 868)
  52. @@ -1,39 +1,53 @@
  53.  /*
  54.   * This program is free software: you can redistribute it and/or modify it under
  55.   * the terms of the GNU General Public License as published by the Free Software
  56.   * Foundation, either version 3 of the License, or (at your option) any later
  57.   * version.
  58.   *
  59.   * This program is distributed in the hope that it will be useful, but WITHOUT
  60.   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  61.   * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  62.   * details.
  63.   *
  64.   * You should have received a copy of the GNU General Public License along with
  65.   * this program. If not, see <http://www.gnu.org/licenses/>.
  66.   */
  67.  package handlers.targethandlers;
  68.  
  69.  import com.l2jserver.gameserver.handler.ITargetTypeHandler;
  70. +import com.l2jserver.gameserver.instancemanager.FortManager;
  71.  import com.l2jserver.gameserver.model.L2Object;
  72.  import com.l2jserver.gameserver.model.actor.L2Character;
  73. +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  74. +import com.l2jserver.gameserver.model.entity.Fort;
  75.  import com.l2jserver.gameserver.model.skills.L2Skill;
  76.  import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
  77.  
  78.  /**
  79.   * @author UnAfraid
  80.   */
  81.  public class TargetFlagPole implements ITargetTypeHandler
  82.  {
  83.     @Override
  84.     public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
  85.     {
  86. -       return new L2Character[] { activeChar };
  87. +       if (!activeChar.isPlayer())
  88. +           return new L2Object[] {};
  89. +      
  90. +       L2PcInstance player = activeChar.getActingPlayer();
  91. +       if (player.getClan() == null)
  92. +           return new L2Object[] {};
  93. +      
  94. +       Fort fort = FortManager.getInstance().getFort(player);
  95. +       if (fort == null || !player.checkIfOkToCastFlagDisplay(fort, true, skill, activeChar.getTarget())) // The first target should be that flagpole
  96. +           return new L2Object[] {};
  97. +      
  98. +       return new L2Object[] { activeChar.getTarget() };
  99.     }
  100.    
  101.     @Override
  102.     public Enum<L2TargetType> getTargetType()
  103.     {
  104.         return L2TargetType.TARGET_FLAGPOLE;
  105.     }
  106.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement