Sublime Self-Sacrifice

L2OFF like Sublime:
diff --git L2J_DataPack/dist/game/data/scripts/handlers/MasterHandler.java L2J_DataPack/dist/game/data/scripts/handlers/MasterHandler.java
index 38a3e91..18b8710 100644
--- L2J_DataPack/dist/game/data/scripts/handlers/MasterHandler.java
+++ L2J_DataPack/dist/game/data/scripts/handlers/MasterHandler.java
@@ -198,6 +198,7 @@
 import handlers.targethandlers.AreaSummon;
 import handlers.targethandlers.Aura;
 import handlers.targethandlers.AuraCorpseMob;
+import handlers.targethandlers.AuraFriendly;
 import handlers.targethandlers.BehindArea;
 import handlers.targethandlers.BehindAura;
 import handlers.targethandlers.Clan;
@@ -541,6 +542,7 @@
          AreaSummon.class,
          Aura.class,
          AuraCorpseMob.class,
+         AuraFriendly.class,
          BehindArea.class,
          BehindAura.class,
          Clan.class,
diff --git L2J_DataPack/dist/game/data/scripts/handlers/targethandlers/AuraFriendly.java L2J_DataPack/dist/game/data/scripts/handlers/targethandlers/AuraFriendly.java
new file mode 100644
index 0000000..4aba145
--- /dev/null
+++ L2J_DataPack/dist/game/data/scripts/handlers/targethandlers/AuraFriendly.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2004-2015 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.targethandlers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * @author Sahar
+ */
+public class AuraFriendly implements ITargetTypeHandler
+{
+   @Override
+   public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
+   {
+      List<L2Character> targetList = new ArrayList<>();
+      L2PcInstance player = activeChar.getActingPlayer();
+      int maxTargets = skill.getAffectLimit();
+      for (L2Character obj : player.getKnownList().getKnownCharactersInRadius(skill.getAffectRange()))
+      {
+         if ((obj == activeChar) || !checkTarget(player, obj))
+         {
+            continue;
+         }
+         
+         if ((maxTargets > 0) && (targetList.size() >= maxTargets))
+         {
+            break;
+         }
+         
+         targetList.add(obj);
+      }
+      
+      if (targetList.isEmpty())
+      {
+         return EMPTY_TARGET_LIST;
+      }
+      
+      return targetList.toArray(new L2Character[targetList.size()]);
+   }
+   
+   private boolean checkTarget(L2PcInstance activeChar, L2Character target)
+   {
+      if (target == null || !GeoData.getInstance().canSeeTarget(activeChar, target))
+      {
+         return false;
+      }
+      
+      if (target.isAlikeDead() || target.isDoor() || (target instanceof L2SiegeFlagInstance) || target.isMonster())
+      {
+         return false;
+      }
+      
+      if (target.isPlayable())
+      {
+         L2PcInstance targetPlayer = target.getActingPlayer();
+         
+         if (activeChar.isInDuelWith(target))
+         {
+            return false;
+         }
+         
+         if (activeChar.isInPartyWith(target))
+         {
+            return true;
+         }
+         
+         if (target.isInsideZone(ZoneId.PVP))
+         {
+            return false;
+         }
+         
+         if (activeChar.isInClanWith(target) || activeChar.isInAllyWith(target) || activeChar.isInCommandChannelWith(target))
+         {
+            return true;
+         }
+         
+         if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getKarma() > 0))
+         {
+            return false;
+         }
+      }
+      
+      return true;
+   }
+   
+   @Override
+   public Enum<L2TargetType> getTargetType()
+   {
+      return L2TargetType.AURA_FRIENDLY;
+   }
+}
\ No newline at end of file
diff --git L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
index 136df16..b2c1ce2 100644
--- L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
+++ L2J_DataPack/dist/game/data/stats/skills/01500-01599.xml
@@ -174,7 +174,7 @@
       <set name="removedOnAnyActionExceptMove" val="true" />
       <set name="reuseDelay" val="3600000" />
       <set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-      <set name="targetType" val="PARTY_NOTME" />
+      <set name="targetType" val="AURA_FRIENDLY" />
       <for>
          <effect name="Invincible" />
          <effect name="CpHeal">
 diff --git L2J_Server/java/com/l2jserver/gameserver/model/actor/L2Character.java L2J_Server/java/com/l2jserver/gameserver/model/actor/L2Character.java
index 990d294..742e401 100644
--- L2J_Server/java/com/l2jserver/gameserver/model/actor/L2Character.java
+++ L2J_Server/java/com/l2jserver/gameserver/model/actor/L2Character.java
@@ -1706,6 +1706,7 @@
          case FRONT_AURA:
          case BEHIND_AURA:
          case GROUND:
+         case AURA_FRIENDLY:
             target = this;
             break;
          case SELF:
@@ -5431,6 +5432,7 @@
             case FRONT_AURA:
             case BEHIND_AURA:
             case AURA_CORPSE_MOB:
+            case AURA_FRIENDLY:
                break;
             default:
                abortCast();
diff --git L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
index 93269db..20ffd61 100644
--- L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
+++ L2J_Server/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
@@ -8423,6 +8423,7 @@
          case SELF:
          case AURA_CORPSE_MOB:
          case COMMAND_CHANNEL:
+         case AURA_FRIENDLY:
             target = this;
             break;
          default:
@@ -8526,6 +8527,7 @@
          case AREA_SUMMON:
          case AURA_CORPSE_MOB:
          case COMMAND_CHANNEL:
+         case AURA_FRIENDLY:
             target = this;
             break;
          case PET:
@@ -8701,6 +8703,7 @@
                case GROUND:
                case AREA_SUMMON:
                case UNLOCKABLE:
+               case AURA_FRIENDLY:
                   break;
                default: // Send a Server->Client packet ActionFailed to the L2PcInstance
                   sendPacket(ActionFailed.STATIC_PACKET);
diff --git L2J_Server/java/com/l2jserver/gameserver/model/skills/targets/L2TargetType.java L2J_Server/java/com/l2jserver/gameserver/model/skills/targets/L2TargetType.java
index fb769e6..35ca360 100644
--- L2J_Server/java/com/l2jserver/gameserver/model/skills/targets/L2TargetType.java
+++ L2J_Server/java/com/l2jserver/gameserver/model/skills/targets/L2TargetType.java
@@ -30,6 +30,7 @@
    AREA_UNDEAD,
    AURA,
    AURA_CORPSE_MOB,
+   AURA_FRIENDLY,
    BEHIND_AREA,
    BEHIND_AURA,
    CLAN,
Comments (3)
