lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pet owner target type skills should not need target.

Browse Source
This commit is contained in:
MobiusDev 2018-09-11 01:36:44 +00:00
parent ce23b6842f
commit 222b1d1136
14 changed files with 77 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java vendored
View File

@ -16,8 +16,8 @@
*/
package handlers.playeractions;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.data.xml.impl.PetSkillData;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IPlayerActionHandler;
import com.l2jmobius.gameserver.model.ActionDataHolder;
import com.l2jmobius.gameserver.model.actor.L2Summon;
@ -33,11 +33,6 @@ public final class ServitorSkillUse implements IPlayerActionHandler
@Override
public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
{
if (activeChar.getTarget() == null)
{
return;
}
final L2Summon summon = activeChar.getAnyServitor();
if ((summon == null) || !summon.isServitor())
{

11
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -51,6 +51,7 @@ import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.ZoneRegion;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -609,7 +610,15 @@ public abstract class L2Summon extends L2Playable
}
// Get the target for the skill
final L2Object target = skill.getTarget(this, forceUse, dontMove, false);
final L2Object target;
if (skill.getTargetType() == TargetType.OWNER_PET)
{
target = _owner;
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
// Check the validity of the target
if (target == null)

7
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java vendored
View File

@ -16,8 +16,8 @@
*/
package handlers.playeractions;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.data.xml.impl.PetSkillData;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IPlayerActionHandler;
import com.l2jmobius.gameserver.model.ActionDataHolder;
import com.l2jmobius.gameserver.model.actor.L2Summon;
@ -33,11 +33,6 @@ public final class ServitorSkillUse implements IPlayerActionHandler
@Override
public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
{
if (activeChar.getTarget() == null)
{
return;
}
final L2Summon summon = activeChar.getAnyServitor();
if ((summon == null) || !summon.isServitor())
{

11
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -51,6 +51,7 @@ import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.ZoneRegion;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -609,7 +610,15 @@ public abstract class L2Summon extends L2Playable
}
// Get the target for the skill
final L2Object target = skill.getTarget(this, forceUse, dontMove, false);
final L2Object target;
if (skill.getTargetType() == TargetType.OWNER_PET)
{
target = _owner;
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
// Check the validity of the target
if (target == null)

7
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java vendored
View File

@ -16,8 +16,8 @@
*/
package handlers.playeractions;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.data.xml.impl.PetSkillData;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IPlayerActionHandler;
import com.l2jmobius.gameserver.model.ActionDataHolder;
import com.l2jmobius.gameserver.model.actor.L2Summon;
@ -33,11 +33,6 @@ public final class ServitorSkillUse implements IPlayerActionHandler
@Override
public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
{
if (activeChar.getTarget() == null)
{
return;
}
final L2Summon summon = activeChar.getAnyServitor();
if ((summon == null) || !summon.isServitor())
{

11
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -51,6 +51,7 @@ import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.ZoneRegion;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -609,7 +610,15 @@ public abstract class L2Summon extends L2Playable
}
// Get the target for the skill
final L2Object target = skill.getTarget(this, forceUse, dontMove, false);
final L2Object target;
if (skill.getTargetType() == TargetType.OWNER_PET)
{
target = _owner;
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
// Check the validity of the target
if (target == null)

7
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java vendored
View File

@ -16,8 +16,8 @@
*/
package handlers.playeractions;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.data.xml.impl.PetSkillData;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IPlayerActionHandler;
import com.l2jmobius.gameserver.model.ActionDataHolder;
import com.l2jmobius.gameserver.model.actor.L2Summon;
@ -33,11 +33,6 @@ public final class ServitorSkillUse implements IPlayerActionHandler
@Override
public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
{
if (activeChar.getTarget() == null)
{
return;
}
final L2Summon summon = activeChar.getAnyServitor();
if ((summon == null) || !summon.isServitor())
{

11
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -51,6 +51,7 @@ import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.ZoneRegion;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -609,7 +610,15 @@ public abstract class L2Summon extends L2Playable
}
// Get the target for the skill
final L2Object target = skill.getTarget(this, forceUse, dontMove, false);
final L2Object target;
if (skill.getTargetType() == TargetType.OWNER_PET)
{
target = _owner;
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
// Check the validity of the target
if (target == null)

7
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java vendored
View File

@ -16,8 +16,8 @@
*/
package handlers.playeractions;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.data.xml.impl.PetSkillData;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IPlayerActionHandler;
import com.l2jmobius.gameserver.model.ActionDataHolder;
import com.l2jmobius.gameserver.model.actor.L2Summon;
@ -33,11 +33,6 @@ public final class ServitorSkillUse implements IPlayerActionHandler
@Override
public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
{
if (activeChar.getTarget() == null)
{
return;
}
final L2Summon summon = activeChar.getAnyServitor();
if ((summon == null) || !summon.isServitor())
{

11
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -51,6 +51,7 @@ import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.ZoneRegion;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -609,7 +610,15 @@ public abstract class L2Summon extends L2Playable
}
// Get the target for the skill
final L2Object target = skill.getTarget(this, forceUse, dontMove, false);
final L2Object target;
if (skill.getTargetType() == TargetType.OWNER_PET)
{
target = _owner;
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
// Check the validity of the target
if (target == null)

7
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java vendored
View File

@ -16,8 +16,8 @@
*/
package handlers.playeractions;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.data.xml.impl.PetSkillData;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IPlayerActionHandler;
import com.l2jmobius.gameserver.model.ActionDataHolder;
import com.l2jmobius.gameserver.model.actor.L2Summon;
@ -33,11 +33,6 @@ public final class ServitorSkillUse implements IPlayerActionHandler
@Override
public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
{
if (activeChar.getTarget() == null)
{
return;
}
final L2Summon summon = activeChar.getAnyServitor();
if ((summon == null) || !summon.isServitor())
{

11
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -51,6 +51,7 @@ import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.ZoneRegion;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -609,7 +610,15 @@ public abstract class L2Summon extends L2Playable
}
// Get the target for the skill
final L2Object target = skill.getTarget(this, forceUse, dontMove, false);
final L2Object target;
if (skill.getTargetType() == TargetType.OWNER_PET)
{
target = _owner;
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
// Check the validity of the target
if (target == null)

7
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java vendored
View File

@ -16,8 +16,8 @@
*/
package handlers.playeractions;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.data.xml.impl.PetSkillData;
import com.l2jmobius.gameserver.data.xml.impl.SkillData;
import com.l2jmobius.gameserver.handler.IPlayerActionHandler;
import com.l2jmobius.gameserver.model.ActionDataHolder;
import com.l2jmobius.gameserver.model.actor.L2Summon;
@ -33,11 +33,6 @@ public final class ServitorSkillUse implements IPlayerActionHandler
@Override
public void useAction(L2PcInstance activeChar, ActionDataHolder data, boolean ctrlPressed, boolean shiftPressed)
{
if (activeChar.getTarget() == null)
{
return;
}
final L2Summon summon = activeChar.getAnyServitor();
if ((summon == null) || !summon.isServitor())
{

11
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -51,6 +51,7 @@ import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.ZoneRegion;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -609,7 +610,15 @@ public abstract class L2Summon extends L2Playable
}
// Get the target for the skill
final L2Object target = skill.getTarget(this, forceUse, dontMove, false);
final L2Object target;
if (skill.getTargetType() == TargetType.OWNER_PET)
{
target = _owner;
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
// Check the validity of the target
if (target == null)